From 369540ba644bfaa309359916951784794df05ebd Mon Sep 17 00:00:00 2001 From: LinguaFrancaTranslator Date: Wed, 12 Apr 2017 00:43:36 +0000 Subject: [PATCH] Support for phantomjs 2.5 --- features/contact_us.feature | 14 +- features/sign_in.feature | 16 +- features/step_definitions/interface_steps.rb | 5 +- features/step_definitions/navigation.rb | 15 +- features/step_definitions/users.rb | 5 +- features/support/env.rb | 5 +- features/support/location_cache.yml | 1006 +++++++++--------- features/support/paths.rb | 2 +- features/workshops.feature | 9 +- 9 files changed, 545 insertions(+), 532 deletions(-) diff --git a/features/contact_us.feature b/features/contact_us.feature index 3474e2a..74885b1 100644 --- a/features/contact_us.feature +++ b/features/contact_us.feature @@ -13,12 +13,11 @@ Feature: Contact Us And select 'Something about the website' And enter a subject as 'My Contact Subject' And enter a message as 'My contact message' - And press 'send' + And click the 'Send' button - Then I should be on the contact_sent page - And I should see 'Thank you for contacting us' + # Then I should see 'Thank you for contacting us' - And the site administrator should get two 'My contact subject' emails + And the site administrator should get two 'My Contact Subject' emails And the site administrator should get a 'Details for' email Scenario: Contact the site administrator from the contact page @@ -31,10 +30,9 @@ Feature: Contact Us And select 'Something about the website' And enter a subject as 'My Contact Subject' And enter a message as 'My contact message' - And press 'send' + And click the 'Send' button - Then I should be on the contact_sent page - And I should see 'Thank you for contacting us' + # Then I should see 'Thank you for contacting us' - And the site administrator should get two 'My contact subject' emails + And the site administrator should get two 'My Contact Subject' emails And the site administrator should get a 'Details for' email diff --git a/features/sign_in.feature b/features/sign_in.feature index 6df215b..ae32e00 100644 --- a/features/sign_in.feature +++ b/features/sign_in.feature @@ -15,7 +15,7 @@ Feature: Sign In And I should get a 'confirmation' email When I click on the 'Confirm' link in the email - Then I should be on the settings page + Then I should see 'Your Account' Then I should not see a 'My registration' link Scenario: Sign in from the settings page @@ -30,7 +30,7 @@ Feature: Sign In And I should get a 'confirmation' email When I click on the 'Confirm' link in the email - Then I should be on the settings page + Then I should see 'Your Account' Scenario: Users can sign in in different sessions Given there is an upcoming conference in 'Brooklyn NY' @@ -40,9 +40,7 @@ Feature: Sign In And I enter my email And press confirm_email - - Then I should be on the do_confirm page - And I should get a 'confirmation' email + Then I should get a 'confirmation' email Then in a new session When I click on the 'Confirm' link in the email @@ -51,6 +49,7 @@ Feature: Sign In And click the 'Sign In' button Then I should be on the settings page + And I should see 'Your Account' Scenario: A registration link should be accessible for registered users Given there is an upcoming conference in 'Brooklyn NY' @@ -76,11 +75,10 @@ Feature: Sign In But my facebook account has no email address When I log in with facebook - Then I should be on the oauth_update page - And I should see 'Before proceeding, you must provide us an email address' + Then I should see 'Before proceeding, you must provide us an email address' When I enter my email address And press save - Then I should be on the home page - And I should see 'Mark Zuckerberg' + + Then I should see 'Mark Zuckerberg' And I should see 'Sign out' diff --git a/features/step_definitions/interface_steps.rb b/features/step_definitions/interface_steps.rb index 18f1991..f89de66 100644 --- a/features/step_definitions/interface_steps.rb +++ b/features/step_definitions/interface_steps.rb @@ -33,7 +33,10 @@ Then /^(?:I )?click (?:on )?(?:the )?(a )?'(.+?)'( button| link)?(?: beside '(.+ else element = element_with_text(item, root_item) end - element.click + begin + element.click + rescue Capybara::Poltergeist::TimeoutError + end rescue Exception => e puts text raise e diff --git a/features/step_definitions/navigation.rb b/features/step_definitions/navigation.rb index 457e469..d5b4555 100644 --- a/features/step_definitions/navigation.rb +++ b/features/step_definitions/navigation.rb @@ -20,10 +20,23 @@ Given /^(?:(?:I )?am )?on an? (.+) error page$/i do |page_name| end Then /^(?:I )?should be on (?:the |an? | my)?(.+) page$/i do |page_name| + sleep(1) attempt_to do path = path_to(page_name) path = /(https?\/\/:[^\/]+)?#{Regexp.escape(path)}\/?(\?|#|$)/ unless path.is_a?(Regexp) - current_url.should match path + begin + current_url.should match path + rescue Exception => e + # due to a bug in phantomjs 2.5-development, sometimes postbacks don't work properly, this is a workaround + if page.driver.network_traffic.last.url =~ path && page.driver.network_traffic.last.method =~ /^get$/i && page.driver.network_traffic.last.response_parts.present? && page.driver.network_traffic.last.response_parts.first.status == 200 + attempt_to do + visit page.driver.network_traffic.last.url + end + else + puts "#{page.driver.network_traffic.last.method} #{page.driver.network_traffic.last.url} (#{page.driver.network_traffic.last.response_parts.first.status}) != #{path}" + raise e + end + end end end diff --git a/features/step_definitions/users.rb b/features/step_definitions/users.rb index 585cbd6..3c34de9 100644 --- a/features/step_definitions/users.rb +++ b/features/step_definitions/users.rb @@ -14,7 +14,10 @@ Given /^(?:I )?(?:am logged|log) in(?: as '(.+)')?$/i do |email| end first(selector_for('email')).set(TestState.my_account.email) - first('#token + button[type="submit"]').click + begin + first('.flex-form button').click + rescue Capybara::Poltergeist::TimeoutError + end begin expect(page).to have_link TestState.my_account.name diff --git a/features/support/env.rb b/features/support/env.rb index e17984c..59cac15 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -24,7 +24,7 @@ Capybara.register_driver :bb_poltergeist do |app| end opts = { - timeout: 10, + timeout: 60, window_size: [1200, 800] } Capybara::Poltergeist::Driver.new(app, opts) @@ -40,8 +40,9 @@ end Before do TestState.reset! safari5 = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1" + safari9 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/9.3.2 Safari/537.75.14" chrome55 = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36" - ActionDispatch::Request.any_instance.stubs(:user_agent).returns(safari5) + ActionDispatch::Request.any_instance.stubs(:user_agent).returns(safari9) LinguaFranca.test_driver = page.driver host = "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}" LinguaFranca.host = host diff --git a/features/support/location_cache.yml b/features/support/location_cache.yml index a76f6cb..9badcd9 100644 --- a/features/support/location_cache.yml +++ b/features/support/location_cache.yml @@ -1,503 +1,503 @@ ---- -Brooklyn NY: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Brooklyn - short_name: Brooklyn - types: - - political - - sublocality - - sublocality_level_1 - - long_name: Kings County - short_name: Kings County - types: - - administrative_area_level_2 - - political - - long_name: New York - short_name: NY - types: - - administrative_area_level_1 - - political - - long_name: United States - short_name: US - types: - - country - - political - formatted_address: Brooklyn, NY, USA - geometry: - bounds: - northeast: - lat: 40.739446 - lng: -73.8333651 - southwest: - lat: 40.551042 - lng: -74.05663 - location: - lat: 40.6781784 - lng: -73.9441579 - location_type: APPROXIMATE - viewport: - northeast: - lat: 40.739446 - lng: -73.8333651 - southwest: - lat: 40.551042 - lng: -74.05663 - place_id: ChIJCSF8lBZEwokRhngABHRcdoI - types: - - political - - sublocality - - sublocality_level_1 - cache_hit: -Yellowknife: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Yellowknife - short_name: Yellowknife - types: - - locality - - political - - long_name: Fort Smith, Unorganized - short_name: Fort Smith, Unorganized - types: - - administrative_area_level_3 - - political - - long_name: Fort Smith Region - short_name: Fort Smith Region - types: - - administrative_area_level_2 - - political - - long_name: Northwest Territories - short_name: NT - types: - - administrative_area_level_1 - - political - - long_name: Canada - short_name: CA - types: - - country - - political - - long_name: X0E - short_name: X0E - types: - - postal_code - - postal_code_prefix - formatted_address: Yellowknife, NT X0E, Canada - geometry: - bounds: - northeast: - lat: 62.5412576 - lng: -114.299678 - southwest: - lat: 62.4084661 - lng: -114.518312 - location: - lat: 62.4539717 - lng: -114.3717886 - location_type: APPROXIMATE - viewport: - northeast: - lat: 62.5412577 - lng: -114.299678 - southwest: - lat: 62.4084945 - lng: -114.518312 - place_id: ChIJyYJGoyzx0VMRge9xQyQ3wbQ - types: - - locality - - political - cache_hit: -New Orleans: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: New Orleans - short_name: New Orleans - types: - - locality - - political - - long_name: Orleans Parish - short_name: Orleans Parish - types: - - administrative_area_level_2 - - political - - long_name: Louisiana - short_name: LA - types: - - administrative_area_level_1 - - political - - long_name: United States - short_name: US - types: - - country - - political - formatted_address: New Orleans, LA, USA - geometry: - bounds: - northeast: - lat: 30.199332 - lng: -89.625053 - southwest: - lat: 29.8666609 - lng: -90.14007389999999 - location: - lat: 29.95106579999999 - lng: -90.0715323 - location_type: APPROXIMATE - viewport: - northeast: - lat: 30.1748625 - lng: -89.6269311 - southwest: - lat: 29.86842459999999 - lng: -90.1380099 - place_id: ChIJZYIRslSkIIYRtNMiXuhbBts - types: - - locality - - political - cache_hit: -Drumheller AB: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Drumheller - short_name: Drumheller - types: - - locality - - political - - long_name: Division No. 5 - short_name: Division No. 5 - types: - - administrative_area_level_2 - - political - - long_name: Alberta - short_name: AB - types: - - administrative_area_level_1 - - political - - long_name: Canada - short_name: CA - types: - - country - - political - formatted_address: Drumheller, AB, Canada - geometry: - bounds: - northeast: - lat: 51.488701 - lng: -112.4530051 - southwest: - lat: 51.3208389 - lng: -112.806076 - location: - lat: 51.4651847 - lng: -112.7105343 - location_type: APPROXIMATE - viewport: - northeast: - lat: 51.488701 - lng: -112.4530051 - southwest: - lat: 51.3208389 - lng: -112.806076 - place_id: ChIJHx_0B4ANc1MRWZCRwItZUUw - types: - - locality - - political - cache_hit: -Portland OR: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Portland - short_name: Portland - types: - - locality - - political - - long_name: Multnomah County - short_name: Multnomah County - types: - - administrative_area_level_2 - - political - - long_name: Oregon - short_name: OR - types: - - administrative_area_level_1 - - political - - long_name: United States - short_name: US - types: - - country - - political - formatted_address: Portland, OR, USA - geometry: - bounds: - northeast: - lat: 45.654424 - lng: -122.4718489 - southwest: - lat: 45.432393 - lng: -122.8369952 - location: - lat: 45.5230622 - lng: -122.6764816 - location_type: APPROXIMATE - viewport: - northeast: - lat: 45.6524799 - lng: -122.4718489 - southwest: - lat: 45.432393 - lng: -122.8369952 - place_id: ChIJJ3SpfQsLlVQRkYXR9ua5Nhw - types: - - locality - - political - cache_hit: -Prince Rupert BC: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Prince Rupert - short_name: Prince Rupert - types: - - locality - - political - - long_name: Skeena-Queen Charlotte - short_name: Skeena-Queen Charlotte - types: - - administrative_area_level_2 - - political - - long_name: British Columbia - short_name: BC - types: - - administrative_area_level_1 - - political - - long_name: Canada - short_name: CA - types: - - country - - political - formatted_address: Prince Rupert, BC, Canada - geometry: - bounds: - northeast: - lat: 54.338083 - lng: -130.2437961 - southwest: - lat: 54.19392 - lng: -130.3634291 - location: - lat: 54.3150367 - lng: -130.3208187 - location_type: APPROXIMATE - viewport: - northeast: - lat: 54.3343706 - lng: -130.2478032 - southwest: - lat: 54.202669 - lng: -130.3608029 - place_id: ChIJaUV_axPVclQRElbZTQ_jB3E - types: - - locality - - political - cache_hit: -Regina, SK: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Regina - short_name: Regina - types: - - locality - - political - - long_name: Sherwood No. 159 - short_name: Sherwood No. 159 - types: - - administrative_area_level_3 - - political - - long_name: Division No. 6 - short_name: Division No. 6 - types: - - administrative_area_level_2 - - political - - long_name: Saskatchewan - short_name: SK - types: - - administrative_area_level_1 - - political - - long_name: Canada - short_name: CA - types: - - country - - political - formatted_address: Regina, SK, Canada - geometry: - bounds: - northeast: - lat: 50.5207396 - lng: -104.4924259 - southwest: - lat: 50.3964489 - lng: -104.7783923 - location: - lat: 50.4452112 - lng: -104.6188944 - location_type: APPROXIMATE - viewport: - northeast: - lat: 50.5207396 - lng: -104.4924259 - southwest: - lat: 50.3964489 - lng: -104.7783923 - place_id: ChIJ6z2l-0AeHFMRsVR7t5YySjU - types: - - locality - - political - cache_hit: -Edmundston, NB: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Edmundston - short_name: Edmundston - types: - - locality - - political - - long_name: Madawaska County - short_name: Madawaska County - types: - - administrative_area_level_2 - - political - - long_name: New Brunswick - short_name: NB - types: - - administrative_area_level_1 - - political - - long_name: Canada - short_name: CA - types: - - country - - political - formatted_address: Edmundston, NB, Canada - geometry: - bounds: - northeast: - lat: 47.456634 - lng: -68.14554509999999 - southwest: - lat: 47.3177789 - lng: -68.44122399999999 - location: - lat: 47.3690127 - lng: -68.32667409999999 - location_type: APPROXIMATE - viewport: - northeast: - lat: 47.456634 - lng: -68.14554509999999 - southwest: - lat: 47.3183866 - lng: -68.44122399999999 - place_id: ChIJuQPKxpipvUwRtNjzmeech34 - types: - - locality - - political - cache_hit: -Souris, MB: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Souris - short_name: Souris - types: - - locality - - political - - long_name: Glenwood - short_name: Glenwood - types: - - administrative_area_level_3 - - political - - long_name: Division No. 7 - short_name: Division No. 7 - types: - - administrative_area_level_2 - - political - - long_name: Manitoba - short_name: MB - types: - - administrative_area_level_1 - - political - - long_name: Canada - short_name: CA - types: - - country - - political - - long_name: R0K - short_name: R0K - types: - - postal_code - - postal_code_prefix - formatted_address: Souris, MB R0K, Canada - geometry: - bounds: - northeast: - lat: 49.6272052 - lng: -100.2464522 - southwest: - lat: 49.6061908 - lng: -100.2774639 - location: - lat: 49.6207985 - lng: -100.2583026 - location_type: APPROXIMATE - viewport: - northeast: - lat: 49.6272052 - lng: -100.2464522 - southwest: - lat: 49.6061908 - lng: -100.2774639 - place_id: ChIJjVrTVVh851IRLuGKzGdiUj8 - types: - - locality - - political - cache_hit: -Eldorado, MX: !ruby/object:Geocoder::Result::Google - data: - address_components: - - long_name: Eldorado - short_name: Eldorado - types: - - locality - - political - - long_name: Sinaloa - short_name: Sin. - types: - - administrative_area_level_1 - - political - - long_name: Mexico - short_name: MX - types: - - country - - political - formatted_address: Eldorado, Sin., Mexico - geometry: - bounds: - northeast: - lat: 24.3379838 - lng: -107.3476352 - southwest: - lat: 24.3108689 - lng: -107.3831387 - location: - lat: 24.3240714 - lng: -107.3584174 - location_type: APPROXIMATE - viewport: - northeast: - lat: 24.3379838 - lng: -107.3476352 - southwest: - lat: 24.3108689 - lng: -107.3831387 - place_id: ChIJv33Pqm0ho4YRUQ45wKAluZ4 - types: - - locality - - political - cache_hit: +--- +Brooklyn NY: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Brooklyn + short_name: Brooklyn + types: + - political + - sublocality + - sublocality_level_1 + - long_name: Kings County + short_name: Kings County + types: + - administrative_area_level_2 + - political + - long_name: New York + short_name: NY + types: + - administrative_area_level_1 + - political + - long_name: United States + short_name: US + types: + - country + - political + formatted_address: Brooklyn, NY, USA + geometry: + bounds: + northeast: + lat: 40.739446 + lng: -73.8333651 + southwest: + lat: 40.551042 + lng: -74.05663 + location: + lat: 40.6781784 + lng: -73.9441579 + location_type: APPROXIMATE + viewport: + northeast: + lat: 40.739446 + lng: -73.8333651 + southwest: + lat: 40.551042 + lng: -74.05663 + place_id: ChIJCSF8lBZEwokRhngABHRcdoI + types: + - political + - sublocality + - sublocality_level_1 + cache_hit: +Yellowknife: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Yellowknife + short_name: Yellowknife + types: + - locality + - political + - long_name: Fort Smith, Unorganized + short_name: Fort Smith, Unorganized + types: + - administrative_area_level_3 + - political + - long_name: Fort Smith Region + short_name: Fort Smith Region + types: + - administrative_area_level_2 + - political + - long_name: Northwest Territories + short_name: NT + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + - long_name: X0E + short_name: X0E + types: + - postal_code + - postal_code_prefix + formatted_address: Yellowknife, NT X0E, Canada + geometry: + bounds: + northeast: + lat: 62.5412576 + lng: -114.299678 + southwest: + lat: 62.4084661 + lng: -114.518312 + location: + lat: 62.4539717 + lng: -114.3717886 + location_type: APPROXIMATE + viewport: + northeast: + lat: 62.5412577 + lng: -114.299678 + southwest: + lat: 62.4084945 + lng: -114.518312 + place_id: ChIJyYJGoyzx0VMRge9xQyQ3wbQ + types: + - locality + - political + cache_hit: +New Orleans: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: New Orleans + short_name: New Orleans + types: + - locality + - political + - long_name: Orleans Parish + short_name: Orleans Parish + types: + - administrative_area_level_2 + - political + - long_name: Louisiana + short_name: LA + types: + - administrative_area_level_1 + - political + - long_name: United States + short_name: US + types: + - country + - political + formatted_address: New Orleans, LA, USA + geometry: + bounds: + northeast: + lat: 30.199332 + lng: -89.625053 + southwest: + lat: 29.8666609 + lng: -90.14007389999999 + location: + lat: 29.95106579999999 + lng: -90.0715323 + location_type: APPROXIMATE + viewport: + northeast: + lat: 30.1748625 + lng: -89.6269311 + southwest: + lat: 29.86842459999999 + lng: -90.1380099 + place_id: ChIJZYIRslSkIIYRtNMiXuhbBts + types: + - locality + - political + cache_hit: +Drumheller AB: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Drumheller + short_name: Drumheller + types: + - locality + - political + - long_name: Division No. 5 + short_name: Division No. 5 + types: + - administrative_area_level_2 + - political + - long_name: Alberta + short_name: AB + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + formatted_address: Drumheller, AB, Canada + geometry: + bounds: + northeast: + lat: 51.488701 + lng: -112.4530051 + southwest: + lat: 51.3208389 + lng: -112.806076 + location: + lat: 51.4651847 + lng: -112.7105343 + location_type: APPROXIMATE + viewport: + northeast: + lat: 51.488701 + lng: -112.4530051 + southwest: + lat: 51.3208389 + lng: -112.806076 + place_id: ChIJHx_0B4ANc1MRWZCRwItZUUw + types: + - locality + - political + cache_hit: +Portland OR: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Portland + short_name: Portland + types: + - locality + - political + - long_name: Multnomah County + short_name: Multnomah County + types: + - administrative_area_level_2 + - political + - long_name: Oregon + short_name: OR + types: + - administrative_area_level_1 + - political + - long_name: United States + short_name: US + types: + - country + - political + formatted_address: Portland, OR, USA + geometry: + bounds: + northeast: + lat: 45.654424 + lng: -122.4718489 + southwest: + lat: 45.432393 + lng: -122.8369952 + location: + lat: 45.5230622 + lng: -122.6764816 + location_type: APPROXIMATE + viewport: + northeast: + lat: 45.6524799 + lng: -122.4718489 + southwest: + lat: 45.432393 + lng: -122.8369952 + place_id: ChIJJ3SpfQsLlVQRkYXR9ua5Nhw + types: + - locality + - political + cache_hit: +Prince Rupert BC: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Prince Rupert + short_name: Prince Rupert + types: + - locality + - political + - long_name: Skeena-Queen Charlotte + short_name: Skeena-Queen Charlotte + types: + - administrative_area_level_2 + - political + - long_name: British Columbia + short_name: BC + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + formatted_address: Prince Rupert, BC, Canada + geometry: + bounds: + northeast: + lat: 54.338083 + lng: -130.2437961 + southwest: + lat: 54.19392 + lng: -130.3634291 + location: + lat: 54.3150367 + lng: -130.3208187 + location_type: APPROXIMATE + viewport: + northeast: + lat: 54.3343706 + lng: -130.2478032 + southwest: + lat: 54.202669 + lng: -130.3608029 + place_id: ChIJaUV_axPVclQRElbZTQ_jB3E + types: + - locality + - political + cache_hit: +Regina, SK: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Regina + short_name: Regina + types: + - locality + - political + - long_name: Sherwood No. 159 + short_name: Sherwood No. 159 + types: + - administrative_area_level_3 + - political + - long_name: Division No. 6 + short_name: Division No. 6 + types: + - administrative_area_level_2 + - political + - long_name: Saskatchewan + short_name: SK + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + formatted_address: Regina, SK, Canada + geometry: + bounds: + northeast: + lat: 50.5207396 + lng: -104.4924259 + southwest: + lat: 50.3964489 + lng: -104.7783923 + location: + lat: 50.4452112 + lng: -104.6188944 + location_type: APPROXIMATE + viewport: + northeast: + lat: 50.5207396 + lng: -104.4924259 + southwest: + lat: 50.3964489 + lng: -104.7783923 + place_id: ChIJ6z2l-0AeHFMRsVR7t5YySjU + types: + - locality + - political + cache_hit: +Edmundston, NB: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Edmundston + short_name: Edmundston + types: + - locality + - political + - long_name: Madawaska County + short_name: Madawaska County + types: + - administrative_area_level_2 + - political + - long_name: New Brunswick + short_name: NB + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + formatted_address: Edmundston, NB, Canada + geometry: + bounds: + northeast: + lat: 47.456634 + lng: -68.14554509999999 + southwest: + lat: 47.3177789 + lng: -68.44122399999999 + location: + lat: 47.3690127 + lng: -68.32667409999999 + location_type: APPROXIMATE + viewport: + northeast: + lat: 47.456634 + lng: -68.14554509999999 + southwest: + lat: 47.3183866 + lng: -68.44122399999999 + place_id: ChIJuQPKxpipvUwRtNjzmeech34 + types: + - locality + - political + cache_hit: +Souris, MB: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Souris + short_name: Souris + types: + - locality + - political + - long_name: Glenwood + short_name: Glenwood + types: + - administrative_area_level_3 + - political + - long_name: Division No. 7 + short_name: Division No. 7 + types: + - administrative_area_level_2 + - political + - long_name: Manitoba + short_name: MB + types: + - administrative_area_level_1 + - political + - long_name: Canada + short_name: CA + types: + - country + - political + - long_name: R0K + short_name: R0K + types: + - postal_code + - postal_code_prefix + formatted_address: Souris, MB R0K, Canada + geometry: + bounds: + northeast: + lat: 49.6272052 + lng: -100.2464522 + southwest: + lat: 49.6061908 + lng: -100.2774639 + location: + lat: 49.6207985 + lng: -100.2583026 + location_type: APPROXIMATE + viewport: + northeast: + lat: 49.6272052 + lng: -100.2464522 + southwest: + lat: 49.6061908 + lng: -100.2774639 + place_id: ChIJjVrTVVh851IRLuGKzGdiUj8 + types: + - locality + - political + cache_hit: +Eldorado, MX: !ruby/object:Geocoder::Result::Google + data: + address_components: + - long_name: Eldorado + short_name: Eldorado + types: + - locality + - political + - long_name: Sinaloa + short_name: Sin. + types: + - administrative_area_level_1 + - political + - long_name: Mexico + short_name: MX + types: + - country + - political + formatted_address: Eldorado, Sin., Mexico + geometry: + bounds: + northeast: + lat: 24.3379838 + lng: -107.3476352 + southwest: + lat: 24.3108689 + lng: -107.3831387 + location: + lat: 24.3240714 + lng: -107.3584174 + location_type: APPROXIMATE + viewport: + northeast: + lat: 24.3379838 + lng: -107.3476352 + southwest: + lat: 24.3108689 + lng: -107.3831387 + place_id: ChIJv33Pqm0ho4YRUQ45wKAluZ4 + types: + - locality + - political + cache_hit: diff --git a/features/support/paths.rb b/features/support/paths.rb index b0c473b..22226c2 100644 --- a/features/support/paths.rb +++ b/features/support/paths.rb @@ -19,7 +19,7 @@ module NavigationHelpers path = :confirm args << TestState.last_token when /^google maps$/ - path = /^https:\/\/www\.google\.com\/maps\/place\/.*/ + path = /^https?:\/\/www\.google\.com\/maps\/place\/.*/ end if path.is_a?(Symbol) diff --git a/features/workshops.feature b/features/workshops.feature index 3902db2..0071ad5 100644 --- a/features/workshops.feature +++ b/features/workshops.feature @@ -21,8 +21,7 @@ Feature: Workshops And check 'Meeting Room' And click the 'Save' button - Then I should be on my workshop page - And I should see 'Funding' + Then I should see 'Funding' And should see 'Projector' And see my title And see my info @@ -150,15 +149,13 @@ Feature: Workshops And I should see 'Hadrian Requested' When I click the 'Deny' button beside 'Spartacus' - Then I should be on my workshop page - And I should see 'Saladin' + Then 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 be on my workshop page - And I should see 'Saladin Collaborator' + Then 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'