Added a tag for things that will not work on Firefox

Added tags for tests that will not work on Sauce Changed build name Tightened up logic Conflicts: common/djangoapps/terrain/browser.py Added flag for session name
2013-08-13 10:06:53 -04:00
parent 97df5aa997
commit 3746c654d8
9 changed files with 25 additions and 8 deletions
--- a/cms/djangoapps/contentstore/features/advanced-settings.feature
+++ b/cms/djangoapps/contentstore/features/advanced-settings.feature
@@ -2,6 +2,8 @@ Feature: Advanced (manual) course policy
  In order to specify course policy settings for which no custom user interface exists
  I want to be able to manually enter JSON key /value pairs

+#Sauce labs does not play nicely with CodeMirror
+
  Scenario: A course author sees default advanced settings
    Given I have opened a new course in Studio
    When I select the Advanced Settings
@@ -11,6 +13,7 @@ Feature: Advanced (manual) course policy
    Given I am on the Advanced Course Settings page in Studio
    Then the settings are alphabetized

+  @Sauce
  Scenario: Test cancel editing key value
    Given I am on the Advanced Course Settings page in Studio
    When I edit the value of a policy key
@@ -19,6 +22,7 @@ Feature: Advanced (manual) course policy
    And I reload the page
    Then the policy key value is unchanged

+  @Sauce
  Scenario: Test editing key value
    Given I am on the Advanced Course Settings page in Studio
    When I edit the value of a policy key and save
@@ -26,6 +30,7 @@ Feature: Advanced (manual) course policy
    And I reload the page
    Then the policy key value is changed

+  @Sauce
  Scenario: Test how multi-line input appears
    Given I am on the Advanced Course Settings page in Studio
    When I create a JSON object as a value for "discussion_topics"
@@ -33,6 +38,7 @@ Feature: Advanced (manual) course policy
    And I reload the page
    Then it is displayed as formatted

+  @Sauce
  Scenario: Test error if value supplied is of the wrong type
    Given I am on the Advanced Course Settings page in Studio
    When I create a JSON object as a value for "display_name"
@@ -41,6 +47,7 @@ Feature: Advanced (manual) course policy
    Then the policy key value is unchanged

  # This feature will work in Firefox only when Firefox is the active window
+  @Sauce
  Scenario: Test automatic quoting of non-JSON values
    Given I am on the Advanced Course Settings page in Studio
    When I create a non-JSON value not in quotes
@@ -48,6 +55,7 @@ Feature: Advanced (manual) course policy
    And I reload the page
    Then it is displayed as a string

+  @Sauce
  Scenario: Confirmation is shown on save
    Given I am on the Advanced Course Settings page in Studio
    When I edit the value of a policy key
--- a/cms/djangoapps/contentstore/features/checklists.feature
+++ b/cms/djangoapps/contentstore/features/checklists.feature
@@ -11,6 +11,7 @@ Feature: Course checklists
    And They are correctly selected after reloading the page

  # CHROME ONLY, due to issues getting link to be active in firefox
+  @Firefox
  Scenario: A task can link to a location within Studio
    Given I have opened Checklists
    When I select a link to the course outline
@@ -19,6 +20,7 @@ Feature: Course checklists
    Then I am brought back to the course outline in the correct state

  # CHROME ONLY, due to issues getting link to be active in firefox
+  @Firefox
  Scenario: A task can link to a location outside Studio
    Given I have opened Checklists
    When I select a link to help page
--- a/cms/djangoapps/contentstore/features/video-editor.feature
+++ b/cms/djangoapps/contentstore/features/video-editor.feature
@@ -1,6 +1,8 @@
 Feature: Video Component Editor
  As a course author, I want to be able to create video components.

+  #Sauce Labs cannot delete cookies
+
  Scenario: User can view Video metadata
    Given I have created a Video component
    And I edit the component
@@ -12,11 +14,13 @@ Feature: Video Component Editor
    Then I can modify the display name
    And my video display name change is persisted on save

+  @Sauce
  Scenario: Captions are hidden when "show captions" is false
    Given I have created a Video component
    And I have set "show captions" to False
    Then when I view the video it does not show the captions

+  @Sauce
  Scenario: Captions are shown when "show captions" is true
    Given I have created a Video component
    And I have set "show captions" to True
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -89,7 +89,8 @@ MITX_FEATURES['SAUCE_BROWSER'] = DesiredCapabilities.CHROME
 MITX_FEATURES['SAUCE_PLATFORM'] = 'Linux'
 MITX_FEATURES['SAUCE_VERSION'] = ''
 MITX_FEATURES['SAUCE_DEVICE'] = ''
-MITX_FEATURES['SAUCE_BUILD'] = 'Feature Test'
+MITX_FEATURES['SAUCE_SESSION'] = 'Lettuce Tests'
+MITX_FEATURES['SAUCE_BUILD'] = 'CMS TESTS'
 MITX_FEATURES['SAUCE_TAGS'] = ''


--- a/common/djangoapps/terrain/browser.py
+++ b/common/djangoapps/terrain/browser.py
@@ -57,7 +57,7 @@ desired_capabilities =  settings.MITX_FEATURES.get('SAUCE_BROWSER', DesiredCapab
 desired_capabilities['platform'] = settings.MITX_FEATURES.get('SAUCE_PLATFORM', 'Linux')
 desired_capabilities['version'] = settings.MITX_FEATURES.get('SAUCE_VERSION', '')
 desired_capabilities['device-type'] = settings.MITX_FEATURES.get('SAUCE_DEVICE', '')
-desired_capabilities['name'] = "Lettuce Test"
+desired_capabilities['name'] = settings.MITX_FEATURES.get('SAUCE_SESSION', 'Lettuce Tests')
 desired_capabilities['build'] = settings.MITX_FEATURES.get('SAUCE_BUILD', 'edX Plaform')
 desired_capabilities['tags'] = settings.MITX_FEATURES.get('SAUCE_TAGS', '')
 desired_capabilities['video-upload-on-pass'] = False
@@ -178,8 +178,5 @@ def teardown_browser(total):
    Quit the browser after executing the tests.
    """
    if settings.MITX_FEATURES.get('USE_SAUCE'):
-        if total.scenarios_ran != total.scenarios_passed:
-            set_job_status(jobid, False)
-        else:
-            set_job_status(jobid, True)
+            set_job_status(jobid, total.scenarios_ran == total.scenarios_passed)
    world.browser.quit()
--- a/lms/djangoapps/courseware/features/login.feature
+++ b/lms/djangoapps/courseware/features/login.feature
@@ -12,6 +12,7 @@ Feature: Login in as a registered user
    Then I should see the login error message "This account has not been activated"

    # CHROME ONLY, firefox will not redirect properly
+    @Firefox
    Scenario: Login to an activated account
    Given I am an edX user
    And I am an activated user
--- a/lms/djangoapps/courseware/features/signup.feature
+++ b/lms/djangoapps/courseware/features/signup.feature
@@ -4,6 +4,7 @@ Feature: Sign in
  I want to signup for a student account

  # CHROME ONLY, firefox will not redirect properly
+  @Firefox
  Scenario: Sign up from the homepage
    Given I visit the homepage
    When I click the link with the text "Register Now"
--- a/lms/djangoapps/courseware/features/video.feature
+++ b/lms/djangoapps/courseware/features/video.feature
@@ -11,6 +11,8 @@ Feature: Video component
  Given the course has a Video component in Youtube mode
  Then when I view the video it has rendered in Youtube mode

+  #Firefox doesn't have HTML5
+  @Firefox
  Scenario: Autoplay is enabled in LMS for a Video component
  Given the course has a Video component in HTML5 mode
-  Then when I view the video it has autoplay enabled
+  Then when I view the video it has autoplay enabled
--- a/lms/envs/acceptance.py
+++ b/lms/envs/acceptance.py
@@ -99,7 +99,8 @@ MITX_FEATURES['SAUCE_BROWSER'] = DesiredCapabilities.CHROME
 MITX_FEATURES['SAUCE_PLATFORM'] = 'Linux'
 MITX_FEATURES['SAUCE_VERSION'] = ''
 MITX_FEATURES['SAUCE_DEVICE'] = ''
-MITX_FEATURES['SAUCE_BUILD'] = 'edX Platform'
+MITX_FEATURES['SAUCE_SESSION'] = 'Lettuce Tests'
+MITX_FEATURES['SAUCE_BUILD'] = 'LMS TESTS'
 MITX_FEATURES['SAUCE_TAGS'] = ''