~elopio/selenium-simple-test/clear-using-keys

« back to all changes in this revision

Viewing changes to src/sst/actions.py

  • Committer: Tarmac
  • Author(s): Corey Goldberg
  • Date: 2011-09-17 16:17:43 UTC
  • mfrom: (184.1.1 fix-non-firefox)
  • Revision ID: tarmac@199959.czyzykowski.com-20110917161743-iy9tav1t925f94tz
[r=coreygoldberg],[bug=852581] removed profile features for non-Firefox browsers

Show diffs side-by-side

added added

removed removed

Lines of Context:
154
154
        browser_type = config.browser_type
155
155
 
156
156
    _print('\nStarting %s:' % browser_type)
 
157
    
157
158
    if webdriver_remote is None:
158
 
        profile = getattr(webdriver, '%sProfile' % browser_type)()
159
 
 
160
159
        if browser_type == 'Firefox':
 
160
            # profile features are FF only
 
161
            profile = getattr(webdriver, '%sProfile' % browser_type)()
161
162
            profile.set_preference('intl.accept_languages', '"en"')
162
 
 
163
 
        if javascript_disabled:
164
 
            profile.set_preference('javascript.enabled', False)
165
 
 
166
 
        browser = getattr(webdriver, browser_type)(profile)
 
163
            if javascript_disabled:
 
164
                profile.set_preference('javascript.enabled', False)
 
165
            browser = getattr(webdriver, browser_type)(profile)
 
166
        else:
 
167
            browser = getattr(webdriver, browser_type)()
167
168
    else:
168
169
        desired_capabilities = {"browserName": browser_type.lower(),
169
170
                                "platform": browser_platform.upper(),