From 5985085cdae4c07cb7e6e98dec901cdf43083ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 15:25:58 +0200 Subject: [PATCH 1/8] bump poltergeist --- Gemfile | 2 +- Gemfile.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 23c20cad4..6c9ed4e8a 100644 --- a/Gemfile +++ b/Gemfile @@ -274,7 +274,7 @@ group :test do gem "capybara", "2.7.1" gem "database_cleaner", "1.5.3" - gem "poltergeist", "1.9.0" + gem "poltergeist", "1.10.0" gem "cucumber-api-steps", "0.13", require: false gem "json_spec", "1.1.4" diff --git a/Gemfile.lock b/Gemfile.lock index a8ec44b3c..6e837cd98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -576,10 +576,9 @@ GEM pg (0.18.4) phantomjs (2.1.1.0) pkg-config (1.1.7) - poltergeist (1.9.0) + poltergeist (1.10.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) powerpack (0.1.1) pronto (0.7.0) @@ -976,7 +975,7 @@ DEPENDENCIES open_graph_reader (= 0.6.1) openid_connect (= 0.11.2) pg (= 0.18.4) - poltergeist (= 1.9.0) + poltergeist (= 1.10.0) pronto (= 0.7.0) pronto-eslint (= 0.7.0) pronto-haml (= 0.7.0) From 20d0a6e29d98bc891424e9cb6c784150d3fa7a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 15:27:23 +0200 Subject: [PATCH 2/8] bump cucumber-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 6c9ed4e8a..1369b678b 100644 --- a/Gemfile +++ b/Gemfile @@ -297,7 +297,7 @@ group :development, :test do gem "rspec-rails", "3.5.1" # Cucumber (integration tests) - gem "cucumber-rails", "1.4.3", require: false + gem "cucumber-rails", "1.4.4", require: false # Jasmine (client side application tests (JS)) gem "jasmine", "2.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 6e837cd98..02a8cc166 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,12 +157,12 @@ GEM rspec (>= 2.12.0) cucumber-core (1.5.0) gherkin (~> 4.0) - cucumber-rails (1.4.3) + cucumber-rails (1.4.4) capybara (>= 1.1.2, < 3) cucumber (>= 1.3.8, < 3) mime-types (>= 1.16, < 4) nokogiri (~> 1.5) - railties (>= 3, < 5) + railties (>= 3, < 5.1) cucumber-wire (0.0.1) database_cleaner (1.5.3) devise (4.2.0) @@ -923,7 +923,7 @@ DEPENDENCIES configurate (= 0.3.1) coveralls cucumber-api-steps (= 0.13) - cucumber-rails (= 1.4.3) + cucumber-rails (= 1.4.4) database_cleaner (= 1.5.3) devise (= 4.2.0) devise-token_authenticatable (= 0.5.2) From 8d5d2db0bfa1fc96424ec266e52651464f0cee1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 15:52:31 +0200 Subject: [PATCH 3/8] stabilize features/mobile/drawer.feature:59 --- features/step_definitions/mobile_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/step_definitions/mobile_steps.rb b/features/step_definitions/mobile_steps.rb index ba0bfba22..34f494de8 100644 --- a/features/step_definitions/mobile_steps.rb +++ b/features/step_definitions/mobile_steps.rb @@ -12,7 +12,7 @@ end When /^I open the drawer$/ do find("#menu-badge").click - expect(find("#app")["class"]).to include "draw" + expect(page).to have_css("#app.draw") end Then /^the aspect dropdown within "([^"]*)" should be labeled "([^"]*)"/ do |selector, label| From 88ecba14d213af0d4bbcb7be6f8650ea4bd417dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 16:03:16 +0200 Subject: [PATCH 4/8] perhaps stabilize features/desktop/aspect_navigation.feature:18 --- features/desktop/aspect_navigation.feature | 3 +++ 1 file changed, 3 insertions(+) diff --git a/features/desktop/aspect_navigation.feature b/features/desktop/aspect_navigation.feature index 84d601857..d6a70ab3b 100644 --- a/features/desktop/aspect_navigation.feature +++ b/features/desktop/aspect_navigation.feature @@ -17,6 +17,9 @@ Feature: Aspect navigation on the left menu Scenario: Aspects selection is remembered through site navigation When I select only "Besties" aspect + Then I should be on the aspects page + + When I go to the stream page And I go to the aspects page Then I should see "Besties" aspect selected And I should see "Unicorns" aspect unselected From e1ed2cacbbc756f17a452ac9dec2f9e24a6f5cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 16:27:28 +0200 Subject: [PATCH 5/8] perhaps stabilize features/mobile/invitations.feature:8 --- features/step_definitions/mobile_steps.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/features/step_definitions/mobile_steps.rb b/features/step_definitions/mobile_steps.rb index 34f494de8..28a966e3a 100644 --- a/features/step_definitions/mobile_steps.rb +++ b/features/step_definitions/mobile_steps.rb @@ -17,6 +17,7 @@ end Then /^the aspect dropdown within "([^"]*)" should be labeled "([^"]*)"/ do |selector, label| within(selector) do - current_scope.should have_css("option.list_cover", :text => label) + current_scope.should have_no_css("option.list_cover", text: "updating...") + current_scope.should have_css("option.list_cover", text: label) end end From e97da964f4bd3acc9c0ebf457c1d87e25b35936f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 16:34:29 +0200 Subject: [PATCH 6/8] add debug output for features/desktop/mentions_from_profile_page.feature:36 --- features/support/publishing_cuke_helpers.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/features/support/publishing_cuke_helpers.rb b/features/support/publishing_cuke_helpers.rb index 36985fc50..bcc7aff8a 100644 --- a/features/support/publishing_cuke_helpers.rb +++ b/features/support/publishing_cuke_helpers.rb @@ -9,7 +9,12 @@ module PublishingCukeHelpers # make sure the other text field got the new contents if input_selector == "#status_message_fake_text" - expect(page).to have_selector("#status_message_text[value='#{status_message_text} #{txt}']", visible: false) + begin + expect(page).to have_selector("#status_message_text[value='#{status_message_text} #{txt}']", visible: false) + rescue RSpec::Expectations::ExpectationNotMetError + puts "Value was instead: #{find('#status_message_text', visible: false).value.inspect}" + raise + end end end From 89b497376f486d0cb6445ffddfcbc56e5f3bb4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 16:50:43 +0200 Subject: [PATCH 7/8] perhaps stabilize features/mobile/reshare.feature:32 --- features/step_definitions/session_steps.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/features/step_definitions/session_steps.rb b/features/step_definitions/session_steps.rb index 56c747fad..03f5bd3ed 100644 --- a/features/step_definitions/session_steps.rb +++ b/features/step_definitions/session_steps.rb @@ -54,6 +54,7 @@ end When /^I (?:log|sign) out$/ do logout + step "I go to the root page" end When /^I (?:log|sign) out manually$/ do From 2fb1d9fa6570a3c9f6bc6abaa27160b1849cc729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 11 Aug 2016 16:56:39 +0200 Subject: [PATCH 8/8] stabilize features/mobile/drawer.feature --- features/mobile/drawer.feature | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/features/mobile/drawer.feature b/features/mobile/drawer.feature index 6338406e3..259f06e17 100644 --- a/features/mobile/drawer.feature +++ b/features/mobile/drawer.feature @@ -30,12 +30,14 @@ Feature: Navigate between pages using the header menu and the drawer Then I should be on the new status message page Scenario: search a user - When I open the drawer + When I have turned off jQuery effects + And I open the drawer And I search for "Bob" Then I should see "Users matching Bob" within "#search_title" Scenario: search for a tag - When I open the drawer + When I have turned off jQuery effects + And I open the drawer And I search for "#bob" Then I should be on the tag page for "bob"