Reverted back to PhatomJs 2.1.1

features/workshops.feature

@@ -56,19 +56,13 @@ Feature: Workshops
     Then I should see 'Deleting a workshop cannot be undone'
 
     When I click on the 'Cancel' button
-    Then I should be on my workshop page
-    And I should see 'Tools'
+    Then I should see 'Tools'
     And should see 'Education'
 
     When I click the 'Delete Workshop' link
     And click the 'Confirm' button
-
-    Then I should be on the delete_workshop page
-    And I click the 'Confirm' button
-
-    # Then I should be on my workshop page
-    # And I should see 'Propose a Workshop'
-    # But I should not see any workshops
+    Then I should see 'Propose a Workshop'
+    But I should not see any workshops
 
   Scenario: Users can comment on an translate their own workshops
     Given that there is an upcoming conference
@@ -85,25 +79,19 @@ Feature: Workshops
     When I enter my title as 'Puentes a las bicicletas'
     And enter some info
     And click the 'Save' button
-    Then I should be on my workshop page
-    And my workshop title should be 'Bridges to Bicycles'
+    Then my workshop title should be 'Bridges to Bicycles'
     And my Spanish workshop title should be 'Puentes a las bicicletas'
     And I should see 'Bridges to Bicycles'
     
     When I enter a comment
     And I click the 'Add Comment' button
-
-    Then I should be on my workshop page
-    And I should see 'less than a minute ago'
+    Then I should see 'less than a minute ago'
     And I should see my comment
 
     When I click the 'Reply' button
     And enter a reply
     And click the 'Reply' button
-    
-    Then I should be on my workshop page
-    And I should see 'less than a minute ago'
-    And I should see my comment
+    Then I should see my comment
     And see my reply
 
   Scenario: Users can add facilitators to their workshops
@@ -135,10 +123,9 @@ Feature: Workshops
     Then I should see 'Please Confirm'
     And I should see 'Yes'
     And click the 'Yes' button
-
     Then I should not see 'Please Confirm'
-    # And I should not see 'new-facilitator@bikebike.org Unregistered'
-    # But I should see 'Applying for 501c3 status'
+    And I should not see 'new-facilitator@bikebike.org Unregistered'
+    But I should see 'Applying for 501c3 status'
 
   Scenario: Users can approve and deny facilitation requests on their workshops
     Given that there is an upcoming conference
@@ -163,13 +150,15 @@ Feature: Workshops
     And I should see 'Hadrian Requested'
 
     When I click the 'Deny' button beside 'Spartacus'
-    Then I should see 'Saladin'
+    Then I should be on my workshop page
+    And I should see 'Saladin'
     And I should see 'Hadrian'
     But I should not see 'Spartacus'
     And 'Spartacus' should get a 'Your request to facilitate ‘Sturmey Archer Hub Repair’ has been denied' email
 
     When I click the 'Approve' button beside 'Saladin'
-    Then I should see 'Saladin Collaborator'
+    Then I should be on my workshop page
+    And I should see 'Saladin Collaborator'
     And 'Saladin' should get a 'You have been added as a facilitator of ‘Sturmey Archer Hub Repair’' email
 
     When I click the 'Approve' button beside 'Hadrian'
@@ -189,9 +178,7 @@ Feature: Workshops
     And see 'Are you sure you would like to remove Hadrian as a facilitator of this workshop?'
 
     When I click on the 'Yes' button
-    And reload the page
-    Then I should be on my workshop page
-    And I should not see 'Hadrian'
+    Then I should not see 'Hadrian'
     
     When I click the 'Transfer Ownership' button beside 'Saladin'
     Then I should see 'Please Confirm'
@@ -205,8 +192,7 @@ Feature: Workshops
     And see 'Are you sure you want to transfer ownership to Saladin?'
 
     When I click the 'Yes' button
-    Then I should be on my workshop page
-    And I should not see 'Saladin Collaborator'
+    Then I should not see 'Saladin Collaborator'
     But I should see 'Saladin Owner'
 
     When I click the 'Leave' button
@@ -221,8 +207,7 @@ Feature: Workshops
     And see 'Are you sure you would like to remove yourself as a facilitator of this workshop?'
 
     When I click the 'Yes' button
-    Then I should be on my workshop page
-    And I should not see 'Leave'
+    Then I should not see 'Leave'
     But I should see 'Make a facilitation request'
 
     When I click the 'Make a facilitation request' button
@@ -245,8 +230,7 @@ Feature: Workshops
     Then I should still see 'Cancel Request'
     When I click the 'Cancel Request' button again
     And click the 'Yes' button
-    Then I should be on my workshop page
-    And I should not see 'Cancel Request'
+    Then I should not see 'Cancel Request'
     But I should see 'Make a facilitation request'
 
   Scenario: Users can add interest to workshops
@@ -306,8 +290,7 @@ Feature: Workshops
     And enter some info
     And click the 'Save' button
 
-    Then I should be on my workshop page
-    And the Spanish workshop title should be 'Horas de las mujeres y de los transexuales'
+    Then the Spanish workshop title should be 'Horas de las mujeres y de los transexuales'
     And I should see 'Women and Transgender shop hours'
     And 'Macbeth' should get a 'The translation for ‘Women and Transgender shop hours’ has been modified' email
 
@@ -326,8 +309,7 @@ Feature: Workshops
     And enter a comment as 'Will you be covering Canadian contracts?'
     And click the 'Add Comment' button
 
-    Then I should be on my workshop page
-    And I should see 'Will you be covering Canadian contracts?'
+    Then I should see 'Will you be covering Canadian contracts?'
     And 'Brunhilda' should get a 'commented' email
 
     When in a new session
@@ -337,6 +319,5 @@ Feature: Workshops
     And enter a reply as 'If we can find a Canadian facilitator'
     And click the 'Reply' button
 
-    Then I should be on my workshop page
-    And I should see 'If we can find a Canadian facilitator'
-    And 'Geronimo' should get a 'replied' email
+    Then I should see 'If we can find a Canadian facilitator'
+    And 'Geronimo' should get a 'replied' email