Update Test related gemsupdate-test-gems

Upgrade to latest version the following gems:
* capybara
* capybara-screenshot
* selenium-webdriver

Updated specs to fix inconsistencies with capybara 3.x

9 files changed, 56 insertions, 30 deletions

diff --git a/Gemfile b/Gemfile
index 2c0eb0cbce4..9bf26f90592 100644
--- a/Gemfile
+++ b/Gemfile
@@ -350,7 +350,7 @@ group :development, :test do
   # Generate Fake data
   gem 'ffaker', '~> 2.10'
 
-  gem 'capybara', '~> 2.15'
+  gem 'capybara', '~> 3.8.2'
   gem 'capybara-screenshot', '~> 1.0.0'
   gem 'selenium-webdriver', '~> 3.12'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ceb5d29252..c621c06082e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,15 +97,15 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (9.0.6)
-    capybara (2.15.1)
+    capybara (3.8.2)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.14)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    capybara-screenshot (1.0.21)
+      capybara (>= 1.0, < 4)
       launchy
     carrierwave (1.2.3)
       activemodel (>= 4.0.0)
@@ -802,7 +802,7 @@ GEM
       activesupport (>= 3.1)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
-    selenium-webdriver (3.12.0)
+    selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
     sentry-raven (2.7.2)
@@ -929,8 +929,8 @@ GEM
       rinku
     with_env (1.1.0)
     xml-simple (1.1.5)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -960,7 +960,7 @@ DEPENDENCIES
   browser (~> 2.5)
   bullet (~> 5.5.0)
   bundler-audit (~> 0.5.0)
-  capybara (~> 2.15)
+  capybara (~> 3.8.2)
   capybara-screenshot (~> 1.0.0)
   carrierwave (= 1.2.3)
   charlock_holmes (~> 0.7.5)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index dd2cd59daae..d5d4c3e6574 100644
--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -94,15 +94,15 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (9.0.6)
-    capybara (2.15.1)
+    capybara (3.8.2)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-screenshot (1.0.14)
-      capybara (>= 1.0, < 3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    capybara-screenshot (1.0.21)
+      capybara (>= 1.0, < 4)
       launchy
     carrierwave (1.2.3)
       activemodel (>= 4.0.0)
@@ -794,7 +794,7 @@ GEM
       activesupport (>= 3.1)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
-    selenium-webdriver (3.12.0)
+    selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
     sentry-raven (2.7.2)
@@ -920,8 +920,8 @@ GEM
       rinku
     with_env (1.1.0)
     xml-simple (1.1.5)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -951,7 +951,7 @@ DEPENDENCIES
   browser (~> 2.5)
   bullet (~> 5.5.0)
   bundler-audit (~> 0.5.0)
-  capybara (~> 2.15)
+  capybara (~> 3.8.2)
   capybara-screenshot (~> 1.0.0)
   carrierwave (= 1.2.3)
   charlock_holmes (~> 0.7.5)
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index 25ed3bdc88e..370077771d0 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -81,14 +81,22 @@ describe 'Admin::Hooks' do
       it 'from hooks list page' do
         visit admin_hooks_path
 
-        expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
+        expect do
+          accept_confirm { find(:link, 'Remove').send_keys(:return) }
+
+          wait_for_requests
+        end.to change(SystemHook, :count).by(-1)
       end
 
       it 'from hook edit page' do
         visit admin_hooks_path
         click_link 'Edit'
 
-        expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
+        expect do
+          accept_confirm { find(:link, 'Remove').send_keys(:return) }
+
+          wait_for_requests
+        end.to change(SystemHook, :count).by(-1)
       end
     end
   end
diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb
index 50ba67f0ffc..d3b9002d92c 100644
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
@@ -62,6 +62,8 @@ describe 'Projects > Members > User requests access', :js do
 
     accept_confirm { click_link 'Withdraw Access Request' }
 
+    wait_for_requests
+
     expect(project.requesters.exists?(user_id: user)).to be_falsey
     expect(page).to have_content 'Your access request to the project has been withdrawn.'
   end
diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
index ae9b65d1a39..2d31e2dca0f 100644
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
@@ -75,7 +75,13 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
         first_u2f_device = register_u2f_device
         second_u2f_device = register_u2f_device(name: 'My other device')
 
-        accept_confirm { click_on "Delete", match: :first }
+        accept_confirm do
+          within('table.u2f-registrations') do
+            find('tr', text: first_u2f_device.name).click_link('Delete')
+          end
+        end
+
+        wait_for_requests
 
         expect(page).to have_content('Successfully deleted')
         expect(page.body).not_to match(first_u2f_device.name)
@@ -263,6 +269,8 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
         visit profile_two_factor_auth_path
         expect do
           accept_confirm { click_on "Disable" }
+
+          wait_for_requests
         end.to change { U2fRegistration.count }.by(-1)
       end
     end
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 18a7a392c12..fe2483e0567 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -51,6 +51,8 @@ end
 Capybara.javascript_driver = :chrome
 Capybara.default_max_wait_time = timeout
 Capybara.ignore_hidden_elements = true
+Capybara.server = :webrick
+Capybara.default_normalize_ws = true
 
 # Keep only the screenshots generated from the last failing test suite
 Capybara::Screenshot.prune_strategy = :keep_last_run
diff --git a/spec/support/shared_examples/features/master_manages_access_requests_shared_example.rb b/spec/support/shared_examples/features/master_manages_access_requests_shared_example.rb
index 75ad948e42c..1b2caef405e 100644
--- a/spec/support/shared_examples/features/master_manages_access_requests_shared_example.rb
+++ b/spec/support/shared_examples/features/master_manages_access_requests_shared_example.rb
@@ -1,10 +1,11 @@
 RSpec.shared_examples 'Maintainer manages access requests' do
-  let(:user) { create(:user) }
   let(:maintainer) { create(:user) }
+  let(:user) { create(:user) }
 
   before do
     entity.request_access(user)
     entity.respond_to?(:add_owner) ? entity.add_owner(maintainer) : entity.add_maintainer(maintainer)
+
     sign_in(maintainer)
   end
 
@@ -19,7 +20,7 @@ RSpec.shared_examples 'Maintainer manages access requests' do
 
     expect_visible_access_request(entity, user)
 
-    accept_confirm { click_on 'Grant access' }
+    click_on 'Grant access'
 
     expect_no_visible_access_request(entity, user)
 
@@ -43,9 +44,13 @@ RSpec.shared_examples 'Maintainer manages access requests' do
     expect(entity.requesters.exists?(user_id: user)).to be_truthy
     expect(page).to have_content "Users requesting access to #{entity.name} 1"
     expect(page).to have_content user.name
+
+    WaitForRequests.wait_for_requests
   end
 
   def expect_no_visible_access_request(entity, user)
+    WaitForRequests.wait_for_requests
+
     expect(entity.requesters.exists?(user_id: user)).to be_falsy
     expect(page).not_to have_content "Users requesting access to #{entity.name}"
   end
diff --git a/spec/views/projects/commit/show.html.haml_spec.rb b/spec/views/projects/commit/show.html.haml_spec.rb
index a9c32122600..c8b597de37c 100644
--- a/spec/views/projects/commit/show.html.haml_spec.rb
+++ b/spec/views/projects/commit/show.html.haml_spec.rb
@@ -54,9 +54,10 @@ describe 'projects/commit/show.html.haml' do
     end
 
     it 'shows that it is in the context of a merge request' do
-      merge_request_url = diffs_project_merge_request_url(project, merge_request, commit_id: commit.id)
+      merge_request_url = diffs_project_merge_request_path(project, merge_request, commit_id: commit.id)
+
       expect(rendered).to have_content("This commit is part of merge request")
-      expect(rendered).to have_link(merge_request.to_reference, merge_request_url)
+      expect(rendered).to have_link(merge_request.to_reference, href: merge_request_url)
     end
   end
 end