From 59c343c0c60b7116a2294cf9f216e24b06b06a5e Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Tue, 4 Jul 2017 13:02:35 +0200
Subject: [PATCH] Increase poltegeist timeout
closes #7478
---
features/desktop/activity_stream.feature | 6 +++---
features/support/env.rb | 2 +-
features/support/user_cuke_helpers.rb | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/features/desktop/activity_stream.feature b/features/desktop/activity_stream.feature
index f6a9d37462..836ea0371d 100644
--- a/features/desktop/activity_stream.feature
+++ b/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?"
diff --git a/features/support/env.rb b/features/support/env.rb
index 0fb5dede34..393446b649 100644
--- a/features/support/env.rb
+++ b/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
diff --git a/features/support/user_cuke_helpers.rb b/features/support/user_cuke_helpers.rb
index 5043d0a0a4..5ec5e3abb5 100644
--- a/features/support/user_cuke_helpers.rb
+++ b/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
--
GitLab