Skip to content

John McEleney / casperjs

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 35533322 35533322955b773fa9b6659a6e59e388c61e5d53 by Nicolas Perriault
Options

added support for phantomjs 1.6 new cli options

1 parent 15af4dc9
Inline Side-by-side
Showing 1 changed file with 9 additions and 3 deletions
...@@ -18,14 +18,16 @@ PHANTOMJS_NATIVE_ARGS = [ ...@@ -18,14 +18,16 @@ PHANTOMJS_NATIVE_ARGS = [
18 'ignore-ssl-errors', 18 'ignore-ssl-errors',
19 'load-images', 19 'load-images',
20 'load-plugins', 20 'load-plugins',
21 'local-storage-path',
22 'local-storage-quota',
21 'local-to-remote-url-access', 23 'local-to-remote-url-access',
22 'max-disk-cache-size', 24 'max-disk-cache-size',
23 'output-encoding', 25 'output-encoding',
24 'remote-debugger-port',
25 'remote-debugger-autorun',
26 'proxy', 26 'proxy',
27 'proxy-auth', 27 'proxy-auth',
28 'proxy-type', 28 'proxy-type',
29 'remote-debugger-port',
30 'remote-debugger-autorun',
29 'script-encoding', 31 'script-encoding',
30 'web-security', 32 'web-security',
31 ] 33 ]
...@@ -44,7 +46,11 @@ for arg in sys.argv[1:]: ...@@ -44,7 +46,11 @@ for arg in sys.argv[1:]:
44 CASPER_PATH = os.path.abspath(os.path.join(os.path.dirname(resolve(__file__)), '..')) 46 CASPER_PATH = os.path.abspath(os.path.join(os.path.dirname(resolve(__file__)), '..'))
45 CASPER_COMMAND = os.environ.get('PHANTOMJS_EXECUTABLE', 'phantomjs').split(' ') 47 CASPER_COMMAND = os.environ.get('PHANTOMJS_EXECUTABLE', 'phantomjs').split(' ')
46 CASPER_COMMAND.extend(PHANTOMJS_ARGS) 48 CASPER_COMMAND.extend(PHANTOMJS_ARGS)
47 CASPER_COMMAND.extend([os.path.join(CASPER_PATH, 'bin', 'bootstrap.js'), '--casper-path=%s' % CASPER_PATH, '--cli']) 49 CASPER_COMMAND.extend([
50 os.path.join(CASPER_PATH, 'bin', 'bootstrap.js'),
51 '--casper-path=%s' % CASPER_PATH,
52 '--cli'
53 ])
48 CASPER_COMMAND.extend(CASPER_ARGS) 54 CASPER_COMMAND.extend(CASPER_ARGS)
49 55
50 try: 56 try:
......