nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Increase poltegeist timeout

Browse source 
closes #7478
This commit is contained in:
flaburgan 2017-07-04 13:02:35 +02:00 committed by Benjamin Neff
parent 068acd93ce
commit 59c343c0c6
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
features/desktop/activity_stream.feature
View file

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

2
features/support/env.rb
View file

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

2
features/support/user_cuke_helpers.rb
View file

@ -32,7 +32,7 @@ module UserCukeHelpers
# integration_sessions controller (automatic) # integration_sessions controller (automatic)
def automatic_login def automatic_login
@me ||= FactoryGirl.create(:user_with_aspect, :getting_started => false) @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" click_button "Login"
end end