Merge lp:~coreygoldberg/selenium-simple-test/no-javascript-disable into lp:selenium-simple-test

[Corey Goldberg]

removed the ability to disable javascript

removed the ability to disable javascript.
(including all references in: source code, documentation, tests, and test app).

This was a firefox-only feature.. and starting with Firefox 23, it is no longer available to disable as a profile feature... so removed from SST.

[lp:~coreygoldberg/selenium-simple-test/no-javascript-disable]

437. By Corey Goldberg on 2013-08-14

fixed comment

438. By Corey Goldberg on 2013-08-14

fixed header typo

[Leo Arias (elopio)]

cgoldberg: 239␉- browser_factory=factory(cmd_opts.javascript_disabled),
shouldn't that be just to remove the param?
factory()
elopio, yup.. fixing now
cgoldberg: ok, I'll +1.

review: Approve (code review)

[lp:~coreygoldberg/selenium-simple-test/no-javascript-disable]

439. By Corey Goldberg on 2013-08-14

fixed browser factory accidentally deleted

[Corey Goldberg (coreygoldberg)]

fixed. merging.

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2013-07-31 15:09:57 +0000
+++ docs/changelog.rst	2013-08-14 14:16:45 +0000
@@ -11,6 +11,7 @@
 
 version **0.2.5** (under development)
 *************************************
+* removed 'disable javascript' feature from Firefox
 
 
 version **0.2.4** (2013 July 30)

=== modified file 'docs/index.rst'
--- docs/index.rst	2013-07-30 19:57:28 +0000
+++ docs/index.rst	2013-08-14 14:16:45 +0000
@@ -127,7 +127,6 @@
     -d DIR_NAME               directory of test case files
     -r REPORT_FORMAT          report type: xml
     -b BROWSER_TYPE           select webdriver (Firefox, Chrome, PhantomJS, etc)
-    -j                        disable javascript in browser
     -m SHARED_DIRECTORY       directory for shared modules
     -q                        output less debugging info during test run
     -V                        print version info and exit
@@ -331,9 +330,6 @@
 
     from sst import config
 
-    # is javascript disabled?
-    config.javascript_disabled
-
     # which browser is being used?
     config.browser_type
 
@@ -350,16 +346,6 @@
     config.cache
 
 
-------------------------
-    Disabling Javascript
-------------------------
-
-If you need to disable Javascript for an individual test, you can do it by
-putting the following at the start of the test::
-
-    JAVASCRIPT_DISABLED = True
-
-
 --------------------------------
     Development on Ubuntu/Debian
 --------------------------------

=== modified file 'docs/remote.rst'
--- docs/remote.rst	2011-12-29 16:49:01 +0000
+++ docs/remote.rst	2013-08-14 14:16:45 +0000
@@ -53,7 +53,6 @@
   -r REPORT_FORMAT      results report format (html, xml, console)
   -b BROWSER_TYPE       select webdriver (Firefox, Chrome, InternetExplorer,
                         etc)
-  -j                    disable javascript in browser
   -m SHARED_MODULES     directory for shared modules
   -q                    output less debugging info during test run
   -s                    save screenshots on failures

=== modified file 'src/sst/browsers.py'
--- src/sst/browsers.py	2013-07-05 16:33:37 +0000
+++ src/sst/browsers.py	2013-08-14 14:16:45 +0000
@@ -43,9 +43,8 @@
 
     webdriver_class = None
 
-    def __init__(self, javascript_disabled=False):
+    def __init__(self):
         super(BrowserFactory, self).__init__()
-        self.javascript_disabled = javascript_disabled
 
     def setup_for_test(self, test):
         """Setup the browser for the given test.
@@ -203,8 +202,6 @@
             profile.set_preference(
                 'capability.policy.default.Window.frameElement.get',
                 'allAccess')
-        if test.javascript_disabled or self.javascript_disabled:
-            profile.set_preference('javascript.enabled', False)
         self.profile = profile
 
     def browser(self):

=== modified file 'src/sst/cases.py'
--- src/sst/cases.py	2013-07-05 17:13:50 +0000
+++ src/sst/cases.py	2013-08-14 14:16:45 +0000
@@ -46,7 +46,6 @@
 
     browser_factory = browsers.FirefoxFactory()
 
-    javascript_disabled = False
     assume_trusted_cert_issuer = False
 
     wait_timeout = 10
@@ -178,11 +177,9 @@
     def setUp(self):
         self._compile_script()
         # The script may override some settings. The default value for
-        # JAVASCRIPT_DISABLED and ASSUME_TRUSTED_CERT_ISSUER are False, so if
-        # the user mentions them in his script, it's to turn them on. Also,
-        # getting our hands on the values used in the script is too hackish ;)
-        if 'JAVASCRIPT_DISABLED' in self.code.co_names:
-            self.javascript_disabled = True
+        # ASSUME_TRUSTED_CERT_ISSUER is False, so if the user mentions it
+        # in his script, it's to turn them on. Also, getting our hands on
+        # the values used in the script is too hackish.
         if 'ASSUME_TRUSTED_CERT_ISSUER' in self.code.co_names:
             self.assume_trusted_cert_issuer = True
         super(SSTScriptTestCase, self).setUp()
@@ -193,7 +190,7 @@
         previous_context = context.store_context()
         self.addCleanup(context.restore_context, previous_context)
         context.populate_context(self.context, self.script_path,
-                                 self.browser.name, self.javascript_disabled)
+                                 self.browser.name)
 
     def _compile_script(self):
         self.script_path = os.path.join(self.script_dir, self.script_name)

=== modified file 'src/sst/command.py'
--- src/sst/command.py	2013-07-05 17:13:50 +0000
+++ src/sst/command.py	2013-08-14 14:16:45 +0000
@@ -25,7 +25,6 @@
 import shutil
 import traceback
 
-
 import sst
 from sst import (
     actions,
@@ -67,9 +66,6 @@
                       default='Firefox',
                       help=('select webdriver (Firefox, Chrome, '
                             'PhantomJS, etc)'))
-    parser.add_option('-j', dest='javascript_disabled',
-                      default=False, action='store_true',
-                      help='disable javascript in browser')
     parser.add_option('-m', dest='shared_directory',
                       default=None,
                       help='directory for shared modules')

=== modified file 'src/sst/config.py'
--- src/sst/config.py	2013-04-23 11:05:53 +0000
+++ src/sst/config.py	2013-08-14 14:16:45 +0000
@@ -23,9 +23,6 @@
 
     from sst import config
 
-    # is javascript disabled?
-    config.javascript_disabled
-
     # which browser is being used?
     config.browser_type
 
@@ -44,7 +41,6 @@
 
 browser_type = 'firefox'
 _current_context = None
-javascript_disabled = False
 shared_directory = None
 results_directory = None
 flags = []

=== modified file 'src/sst/context.py'
--- src/sst/context.py	2013-04-11 14:34:47 +0000
+++ src/sst/context.py	2013-08-14 14:16:45 +0000
@@ -29,10 +29,7 @@
 )
 
 
-def populate_context(
-        context, path, browser_type,
-        javascript_disabled, arguments=None
-):
+def populate_context(context, path, browser_type, arguments=None):
     """Create the execution context for a test"""
 
     name = os.path.splitext(os.path.split(path)[1])[0]
@@ -42,7 +39,6 @@
 
     config._current_context = context
     config.browser_type = browser_type
-    config.javascript_disabled = javascript_disabled
     config.__args__ = arguments or {}
     config.cache.clear()
 
@@ -93,10 +89,7 @@
     )
 
     context = {}
-    populate_context(
-        context, location, config.browser_type,
-        config.javascript_disabled, kwargs
-    )
+    populate_context(context, location, config.browser_type, kwargs)
 
     with open(location) as h:
         exec h.read() in context

=== modified file 'src/sst/scripts/remote.py'
--- src/sst/scripts/remote.py	2013-06-07 14:36:15 +0000
+++ src/sst/scripts/remote.py	2013-08-14 14:16:45 +0000
@@ -21,7 +21,6 @@
 import os
 import sys
 
-
 import testtools
 
 testtools.try_import('selenium')
@@ -44,7 +43,6 @@
             "browserName": cmd_opts.browser_type.lower(),
             "platform": cmd_opts.browser_platform.upper(),
             "version": cmd_opts.browser_version,
-            "javascriptEnabled": not cmd_opts.javascript_disabled,
             "name": cmd_opts.session_name},
         cmd_opts.webdriver_remote_url)
     runtests.runtests(

=== modified file 'src/sst/scripts/run.py'
--- src/sst/scripts/run.py	2013-07-05 17:13:50 +0000
+++ src/sst/scripts/run.py	2013-08-14 14:16:45 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-#   Copyright (c) 2011-2012 Canonical Ltd.
+#   Copyright (c) 2011,2012,2013 Canonical Ltd.
 #
 #   This file is part of: SST (selenium-simple-test)
 #   https://launchpad.net/selenium-simple-test
@@ -54,7 +54,7 @@
             test_dir=cmd_opts.dir_name,
             collect_only=cmd_opts.collect_only,
             report_format=cmd_opts.report_format,
-            browser_factory=factory(cmd_opts.javascript_disabled),
+            browser_factory=factory(),
             shared_directory=cmd_opts.shared_directory,
             screenshots_on=cmd_opts.screenshots_on,
             concurrency_num=cmd_opts.concurrency,

=== modified file 'src/sst/scripts/test.py'
--- src/sst/scripts/test.py	2013-07-05 17:13:50 +0000
+++ src/sst/scripts/test.py	2013-08-14 14:16:45 +0000
@@ -69,7 +69,7 @@
             test_dir=test_dir,
             collect_only=cmd_opts.collect_only,
             report_format=cmd_opts.report_format,
-            browser_factory=factory(cmd_opts.javascript_disabled),
+            browser_factory=factory(),
             shared_directory=shared_directory,
             screenshots_on=cmd_opts.screenshots_on,
             concurrency_num=cmd_opts.concurrency,

=== modified file 'src/sst/selftests/context.py'
--- src/sst/selftests/context.py	2013-05-14 08:14:43 +0000
+++ src/sst/selftests/context.py	2013-08-14 14:16:45 +0000
@@ -4,7 +4,6 @@
 assert locals() == config._current_context
 assert config.browser_type
 assert config.__args__ == {}
-assert not config.javascript_disabled
 assert __name__ == 'context'
 assert __file__.endswith('context.py')
 

=== removed file 'src/sst/selftests/no_js.py'
--- src/sst/selftests/no_js.py	2013-05-07 14:41:34 +0000
+++ src/sst/selftests/no_js.py	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-import sst
-import sst.actions
-from sst import config
-
-# disabling javascript is currently only implemented for Firefox in sst
-if config.browser_type != 'firefox':
-    sst.actions.skip()
-
-JAVASCRIPT_DISABLED = True
-
-sst.actions.set_base_url('http://localhost:%s/' % sst.DEVSERVER_PORT)
-sst.actions.go_to('/nojs/')
-
-sst.actions.assert_text('test', "Before JS")
-
-from sst import config
-assert config.javascript_disabled

=== modified file 'src/sst/tests/test_sst_run.py'
--- src/sst/tests/test_sst_run.py	2013-07-08 07:36:57 +0000
+++ src/sst/tests/test_sst_run.py	2013-08-14 14:16:45 +0000
@@ -72,5 +72,4 @@
         self.assertEqual(config.browser_type, 'firefox')
         self.assertEqual(config.cache, {})
         self.assertEqual(config.flags, [])
-        self.assertFalse(config.javascript_disabled)
         self.assertIs(None, config.results_directory)

=== removed file 'src/testproject/templates/nojs.html'
--- src/testproject/templates/nojs.html	2011-12-31 04:07:20 +0000
+++ src/testproject/templates/nojs.html	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<html>
-  <head>
-    <title>{{ title }}</title>
-    <link rel="stylesheet" type="text/css" href="./static-files/style.css" />
-  </head>
-  <body>
-    <div id="test">Before JS</div>
-    <script type="text/javascript">
-      var div = document.getElementById('test');
-      div.innerHTML = 'After JS';
-    </script>
-  </body>
-</html>

=== modified file 'src/testproject/urls.py'
--- src/testproject/urls.py	2013-07-03 15:22:40 +0000
+++ src/testproject/urls.py	2013-08-14 14:16:45 +0000
@@ -16,7 +16,6 @@
                        (r'simple', include('testproject.simple.urls')),
                        (r'begin', 'simple.views.begin'),
                        (r'longscroll', 'simple.views.longscroll'),
-                       (r'nojs', 'simple.views.nojs'),
                        (r'html5', 'simple.views.html5'),
                        (r'popup', 'simple.views.popup'),
                        (r'frame_a', 'simple.views.frame_a'),