Merge branch 'update-capybara' into 'master'
Update capybara and selenium-webdriver See merge request gitlab-org/gitlab-ce!27201
This commit is contained in:
commit
d697c1d836
6
Gemfile
6
Gemfile
|
@ -345,9 +345,9 @@ group :development, :test do
|
||||||
# Generate Fake data
|
# Generate Fake data
|
||||||
gem 'ffaker', '~> 2.10'
|
gem 'ffaker', '~> 2.10'
|
||||||
|
|
||||||
gem 'capybara', '~> 2.16.1'
|
gem 'capybara', '~> 2.18.0'
|
||||||
gem 'capybara-screenshot', '~> 1.0.18'
|
gem 'capybara-screenshot', '~> 1.0.22'
|
||||||
gem 'selenium-webdriver', '~> 3.12'
|
gem 'selenium-webdriver', '~> 3.141'
|
||||||
|
|
||||||
gem 'spring', '~> 2.0.0'
|
gem 'spring', '~> 2.0.0'
|
||||||
gem 'spring-commands-rspec', '~> 1.0.4'
|
gem 'spring-commands-rspec', '~> 1.0.4'
|
||||||
|
|
22
Gemfile.lock
22
Gemfile.lock
|
@ -100,13 +100,13 @@ GEM
|
||||||
bundler (~> 1.2)
|
bundler (~> 1.2)
|
||||||
thor (~> 0.18)
|
thor (~> 0.18)
|
||||||
byebug (9.1.0)
|
byebug (9.1.0)
|
||||||
capybara (2.16.1)
|
capybara (2.18.0)
|
||||||
addressable
|
addressable
|
||||||
mini_mime (>= 0.1.3)
|
mini_mime (>= 0.1.3)
|
||||||
nokogiri (>= 1.3.3)
|
nokogiri (>= 1.3.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-test (>= 0.5.4)
|
rack-test (>= 0.5.4)
|
||||||
xpath (~> 2.0)
|
xpath (>= 2.0, < 4.0)
|
||||||
capybara-screenshot (1.0.22)
|
capybara-screenshot (1.0.22)
|
||||||
capybara (>= 1.0, < 4)
|
capybara (>= 1.0, < 4)
|
||||||
launchy
|
launchy
|
||||||
|
@ -488,7 +488,7 @@ GEM
|
||||||
net-ssh (5.0.1)
|
net-ssh (5.0.1)
|
||||||
netrc (0.11.0)
|
netrc (0.11.0)
|
||||||
nio4r (2.3.1)
|
nio4r (2.3.1)
|
||||||
nokogiri (1.10.1)
|
nokogiri (1.10.2)
|
||||||
mini_portile2 (~> 2.4.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
nokogumbo (1.5.0)
|
nokogumbo (1.5.0)
|
||||||
nokogiri
|
nokogiri
|
||||||
|
@ -706,7 +706,7 @@ GEM
|
||||||
redis-store (>= 1.2, < 2)
|
redis-store (>= 1.2, < 2)
|
||||||
redis-store (1.6.0)
|
redis-store (1.6.0)
|
||||||
redis (>= 2.2, < 5)
|
redis (>= 2.2, < 5)
|
||||||
regexp_parser (1.3.0)
|
regexp_parser (1.4.0)
|
||||||
regexp_property_values (0.3.4)
|
regexp_property_values (0.3.4)
|
||||||
representable (3.0.4)
|
representable (3.0.4)
|
||||||
declarative (< 0.1.0)
|
declarative (< 0.1.0)
|
||||||
|
@ -815,9 +815,9 @@ GEM
|
||||||
seed-fu (2.3.7)
|
seed-fu (2.3.7)
|
||||||
activerecord (>= 3.1)
|
activerecord (>= 3.1)
|
||||||
activesupport (>= 3.1)
|
activesupport (>= 3.1)
|
||||||
selenium-webdriver (3.12.0)
|
selenium-webdriver (3.141.0)
|
||||||
childprocess (~> 0.5)
|
childprocess (~> 0.5)
|
||||||
rubyzip (~> 1.2)
|
rubyzip (~> 1.2, >= 1.2.2)
|
||||||
sentry-raven (2.9.0)
|
sentry-raven (2.9.0)
|
||||||
faraday (>= 0.7.6, < 1.0)
|
faraday (>= 0.7.6, < 1.0)
|
||||||
settingslogic (2.0.9)
|
settingslogic (2.0.9)
|
||||||
|
@ -943,8 +943,8 @@ GEM
|
||||||
rinku
|
rinku
|
||||||
with_env (1.1.0)
|
with_env (1.1.0)
|
||||||
xml-simple (1.1.5)
|
xml-simple (1.1.5)
|
||||||
xpath (2.1.0)
|
xpath (3.2.0)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.8)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
@ -974,8 +974,8 @@ DEPENDENCIES
|
||||||
browser (~> 2.5)
|
browser (~> 2.5)
|
||||||
bullet (~> 5.5.0)
|
bullet (~> 5.5.0)
|
||||||
bundler-audit (~> 0.5.0)
|
bundler-audit (~> 0.5.0)
|
||||||
capybara (~> 2.16.1)
|
capybara (~> 2.18.0)
|
||||||
capybara-screenshot (~> 1.0.18)
|
capybara-screenshot (~> 1.0.22)
|
||||||
carrierwave (~> 1.3)
|
carrierwave (~> 1.3)
|
||||||
charlock_holmes (~> 0.7.5)
|
charlock_holmes (~> 0.7.5)
|
||||||
chronic (~> 0.10.2)
|
chronic (~> 0.10.2)
|
||||||
|
@ -1146,7 +1146,7 @@ DEPENDENCIES
|
||||||
sass-rails (~> 5.0.6)
|
sass-rails (~> 5.0.6)
|
||||||
scss_lint (~> 0.56.0)
|
scss_lint (~> 0.56.0)
|
||||||
seed-fu (~> 2.3.7)
|
seed-fu (~> 2.3.7)
|
||||||
selenium-webdriver (~> 3.12)
|
selenium-webdriver (~> 3.141)
|
||||||
sentry-raven (~> 2.7)
|
sentry-raven (~> 2.7)
|
||||||
settingslogic (~> 2.0.9)
|
settingslogic (~> 2.0.9)
|
||||||
sham_rack (~> 1.3.6)
|
sham_rack (~> 1.3.6)
|
||||||
|
|
|
@ -49,7 +49,7 @@ GEM
|
||||||
mini_portile2 (2.4.0)
|
mini_portile2 (2.4.0)
|
||||||
minitest (5.11.1)
|
minitest (5.11.1)
|
||||||
netrc (0.11.0)
|
netrc (0.11.0)
|
||||||
nokogiri (1.10.1)
|
nokogiri (1.10.2)
|
||||||
mini_portile2 (~> 2.4.0)
|
mini_portile2 (~> 2.4.0)
|
||||||
pry (0.11.3)
|
pry (0.11.3)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
|
|
|
@ -73,22 +73,26 @@ describe 'Admin::Hooks' do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Remove existing hook', :js do
|
describe 'Remove existing hook', :js do
|
||||||
|
let(:hook_url) { generate(:url) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
create(:system_hook)
|
create(:system_hook, url: hook_url)
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'removes existing hook' do
|
context 'removes existing hook' do
|
||||||
it 'from hooks list page' do
|
it 'from hooks list page' do
|
||||||
visit admin_hooks_path
|
visit admin_hooks_path
|
||||||
|
|
||||||
expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
|
accept_confirm { click_link 'Remove' }
|
||||||
|
expect(page).not_to have_content(hook_url)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'from hook edit page' do
|
it 'from hook edit page' do
|
||||||
visit admin_hooks_path
|
visit admin_hooks_path
|
||||||
click_link 'Edit'
|
click_link 'Edit'
|
||||||
|
|
||||||
expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
|
accept_confirm { click_link 'Remove' }
|
||||||
|
expect(page).not_to have_content(hook_url)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -62,8 +62,9 @@ describe 'Projects > Members > User requests access', :js do
|
||||||
|
|
||||||
accept_confirm { click_link 'Withdraw Access Request' }
|
accept_confirm { click_link 'Withdraw Access Request' }
|
||||||
|
|
||||||
expect(project.requesters.exists?(user_id: user)).to be_falsey
|
|
||||||
expect(page).to have_content 'Your access request to the project has been withdrawn.'
|
expect(page).to have_content 'Your access request to the project has been withdrawn.'
|
||||||
|
expect(page).not_to have_content 'Withdraw Access Request'
|
||||||
|
expect(page).to have_content 'Request Access'
|
||||||
end
|
end
|
||||||
|
|
||||||
def open_project_settings_menu
|
def open_project_settings_menu
|
||||||
|
|
|
@ -246,26 +246,6 @@ describe 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "when two-factor authentication is disabled" do
|
|
||||||
let(:user) { create(:user) }
|
|
||||||
|
|
||||||
before do
|
|
||||||
user = gitlab_sign_in(:user)
|
|
||||||
user.update_attribute(:otp_required_for_login, true)
|
|
||||||
visit profile_account_path
|
|
||||||
manage_two_factor_authentication
|
|
||||||
expect(page).to have_content("Your U2F device needs to be set up.")
|
|
||||||
register_u2f_device
|
|
||||||
end
|
|
||||||
|
|
||||||
it "deletes u2f registrations" do
|
|
||||||
visit profile_two_factor_auth_path
|
|
||||||
expect do
|
|
||||||
accept_confirm { click_on "Disable" }
|
|
||||||
end.to change { U2fRegistration.count }.by(-1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'fallback code authentication' do
|
describe 'fallback code authentication' do
|
||||||
|
|
|
@ -19,7 +19,7 @@ RSpec.shared_examples 'Maintainer manages access requests' do
|
||||||
|
|
||||||
expect_visible_access_request(entity, user)
|
expect_visible_access_request(entity, user)
|
||||||
|
|
||||||
accept_confirm { click_on 'Grant access' }
|
click_on 'Grant access'
|
||||||
|
|
||||||
expect_no_visible_access_request(entity, user)
|
expect_no_visible_access_request(entity, user)
|
||||||
|
|
||||||
|
@ -40,13 +40,11 @@ RSpec.shared_examples 'Maintainer manages access requests' do
|
||||||
end
|
end
|
||||||
|
|
||||||
def expect_visible_access_request(entity, user)
|
def expect_visible_access_request(entity, user)
|
||||||
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 "Users requesting access to #{entity.name} 1"
|
||||||
expect(page).to have_content user.name
|
expect(page).to have_content user.name
|
||||||
end
|
end
|
||||||
|
|
||||||
def expect_no_visible_access_request(entity, user)
|
def expect_no_visible_access_request(entity, user)
|
||||||
expect(entity.requesters.exists?(user_id: user)).to be_falsy
|
|
||||||
expect(page).not_to have_content "Users requesting access to #{entity.name}"
|
expect(page).not_to have_content "Users requesting access to #{entity.name}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue