Skip tests that break on Ubuntu due to alerts (which will be removed

soon anyway).  Removed @skip-phantom and @skip-firefox tags

Fixed sign up test to work in Ubuntu

Added comments

cms/djangoapps/contentstore/features/advanced-settings.feature

@@ -11,7 +11,7 @@ Feature: Advanced (manual) course policy
     Given I am on the Advanced Course Settings page in Studio
     Then the settings are alphabetized
 
-  @skip-phantom
+  @skip
   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
@@ -20,7 +20,7 @@ Feature: Advanced (manual) course policy
     And I reload the page
     Then the policy key value is unchanged
 
-  @skip-phantom
+  @skip
   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
@@ -28,7 +28,7 @@ Feature: Advanced (manual) course policy
     And I reload the page
     Then the policy key value is changed
 
-  @skip-phantom
+  @skip
   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
@@ -36,7 +36,7 @@ Feature: Advanced (manual) course policy
     And I reload the page
     Then it is displayed as formatted
 
-  @skip-phantom
+  @skip
   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

cms/djangoapps/contentstore/features/checklists.feature

@@ -10,8 +10,6 @@ Feature: Course checklists
     Then I can check and uncheck tasks in a checklist
     And They are correctly selected after I reload the page
 
-  @skip-phantom
-  @skip-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,8 +17,6 @@ Feature: Course checklists
     And I press the browser back button
     Then I am brought back to the course outline in the correct state
 
-  @skip-phantom
-  @skip-firefox
   Scenario: A task can link to a location outside Studio
     Given I have opened Checklists
     When I select a link to help page

cms/djangoapps/contentstore/features/course-settings.feature

@@ -1,20 +1,17 @@
 Feature: Course Settings
   As a course author, I want to be able to configure my course settings.
 
-  @skip-phantom
   Scenario: User can set course dates
     Given I have opened a new course in Studio
     When I select Schedule and Details
     And I set course dates
     Then I see the set dates on refresh
 
-  @skip-phantom
   Scenario: User can clear previously set course dates (except start date)
     Given I have set course dates
     And I clear all the dates except start
     Then I see cleared dates on refresh
 
-  @skip-phantom
   Scenario: User cannot clear the course start date
     Given I have set course dates
     And I clear the course start date

cms/djangoapps/contentstore/features/section.feature

@@ -3,7 +3,6 @@ Feature: Create Section
   As a course author
   I want to create and edit sections
 
-  @skip-phantom
   Scenario: Add a new section to a course
     Given I have opened a new course in Studio
     When I click the New Section link
@@ -27,7 +26,7 @@ Feature: Create Section
     And I save a new section release date
     Then the section release date is updated
 
-  @skip-phantom
+  @skip
   Scenario: Delete section
     Given I have opened a new course in Studio
     And I have added a new section

cms/djangoapps/contentstore/features/studio-overview-togglesection.feature

@@ -14,7 +14,6 @@ Feature: Overview Toggle Section
     When I navigate to the course overview page
     Then I do not see the "Collapse All Sections" link
 
-  @skip-phantom
 	Scenario: Collapse link appears after creating first section of a course
 		Given I have a course with no sections
     When I navigate to the course overview page
@@ -22,7 +21,7 @@ Feature: Overview Toggle Section
     Then I see the "Collapse All Sections" link
     And all sections are expanded
 
-	@skip-phantom
+    @skip
 	Scenario: Collapse link is not removed after last section of a course is deleted
 		Given I have a course with 1 section
     And I navigate to the course overview page

cms/djangoapps/contentstore/features/subsection.feature

@@ -3,14 +3,12 @@ Feature: Create Subsection
   As a course author
   I want to create and edit subsections
 
-  @skip-phantom
   Scenario: Add a new subsection to a section
     Given I have opened a new course section in Studio
     When I click the New Subsection link
     And I enter the subsection name and click save
     Then I see my subsection on the Courseware page
 
-  @skip-phantom
   Scenario: Add a new subsection (with a name containing a quote) to a section (bug #216)
     Given I have opened a new course section in Studio
     When I click the New Subsection link
@@ -27,7 +25,6 @@ Feature: Create Subsection
     And I reload the page
     Then I see it marked as Homework
 
-  @skip-phantom
   Scenario: Set a due date in a different year (bug #256)
     Given I have opened a new subsection in Studio
     And I have set a release date and due date in different years
@@ -35,7 +32,6 @@ Feature: Create Subsection
     And I reload the page
     Then I see the correct dates
 
-  @skip-phantom
   Scenario: Delete a subsection
     Given I have opened a new course section in Studio
     And I have added a new subsection

common/djangoapps/terrain/browser.py

@@ -62,6 +62,7 @@ def initial_setup(server):
             world.visit('/')
 
         except WebDriverException:
+            world.browser.quit()
             num_attempts += 1
 
         else:

common/djangoapps/terrain/ui_helpers.py

@@ -53,12 +53,9 @@ def css_find(css):
 
 @world.absorb
 def css_click(css_selector):
-    '''
-    First try to use the regular click method,
-    but if clicking in the middle of an element
-    doesn't work it might be that it thinks some other
-    element is on top of it there so click in the upper left
-    '''
+    """
+    Perform a click on a CSS selector, retrying if it initially fails
+    """
     try:
         world.browser.find_by_css(css_selector).click()
 

rakefile

@@ -246,7 +246,7 @@ end
 def run_acceptance_tests(system, report_dir, harvest_args)
     sh(django_admin(system, 'acceptance', 'syncdb', '--noinput'))
     sh(django_admin(system, 'acceptance', 'migrate', '--noinput'))
-    sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', harvest_args))
+    sh(django_admin(system, 'acceptance', 'harvest', '--debug-mode', '--tag -skip', harvest_args))
 end