Increase poltegeist timeout

closes #7478

features/desktop/activity_stream.feature

@@ -6,11 +6,11 @@ Feature: The activity stream
       | Bob Jones   | bob@bob.bob       |
       | Alice Smith | alice@alice.alice |
     And a user with email "bob@bob.bob" is connected with "alice@alice.alice"
-    When "alice@alice.alice" has posted a status message with a photo
+    And "alice@alice.alice" has posted a status message with a photo
 
   Scenario: delete a comment
-    When "bob@bob.bob" has commented "is that a poodle?" on "Look at this dog"
-    And I sign in as "bob@bob.bob"
+    Given "bob@bob.bob" has commented "is that a poodle?" on "Look at this dog"
+    When I sign in as "bob@bob.bob"
     And I go to the activity stream page
     Then I should see "Look at this dog"
     And I should see "is that a poodle?"

features/support/env.rb

@@ -23,7 +23,7 @@ Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
 Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
 
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, timeout: 60)
+  Capybara::Poltergeist::Driver.new(app, timeout: 80)
 end
 
 Capybara.javascript_driver = :poltergeist

features/support/user_cuke_helpers.rb

@@ -32,7 +32,7 @@ module UserCukeHelpers
   # integration_sessions controller (automatic)
   def automatic_login
     @me ||= FactoryGirl.create(:user_with_aspect, :getting_started => false)
-    visit(new_integration_sessions_path(:user_id => @me.id))
+    visit(new_integration_sessions_path(user_id: @me.id))
     click_button "Login"
   end