提交 424c4673 编写于 作者: R Rémy Coutable

Merge branch 'rs-update-capybara' into 'master'

Update capybara 2.6.2 -> 2.15.1

See merge request !13976
...@@ -324,7 +324,7 @@ group :development, :test do ...@@ -324,7 +324,7 @@ group :development, :test do
# Generate Fake data # Generate Fake data
gem 'ffaker', '~> 2.4' gem 'ffaker', '~> 2.4'
gem 'capybara', '~> 2.6.2' gem 'capybara', '~> 2.15.0'
gem 'capybara-screenshot', '~> 1.0.0' gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.9.0' gem 'poltergeist', '~> 1.9.0'
......
...@@ -100,9 +100,9 @@ GEM ...@@ -100,9 +100,9 @@ GEM
bundler (~> 1.2) bundler (~> 1.2)
thor (~> 0.18) thor (~> 0.18)
byebug (9.0.6) byebug (9.0.6)
capybara (2.6.2) capybara (2.15.1)
addressable addressable
mime-types (>= 1.16) 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)
...@@ -479,6 +479,7 @@ GEM ...@@ -479,6 +479,7 @@ GEM
method_source (0.8.2) method_source (0.8.2)
mime-types (2.99.3) mime-types (2.99.3)
mimemagic (0.3.0) mimemagic (0.3.0)
mini_mime (0.1.4)
mini_portile2 (2.2.0) mini_portile2 (2.2.0)
minitest (5.7.0) minitest (5.7.0)
mmap2 (2.2.7) mmap2 (2.2.7)
...@@ -948,7 +949,7 @@ GEM ...@@ -948,7 +949,7 @@ GEM
expression_parser expression_parser
rinku rinku
xml-simple (1.1.5) xml-simple (1.1.5)
xpath (2.0.0) xpath (2.1.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
PLATFORMS PLATFORMS
...@@ -979,7 +980,7 @@ DEPENDENCIES ...@@ -979,7 +980,7 @@ DEPENDENCIES
browser (~> 2.2) browser (~> 2.2)
bullet (~> 5.5.0) bullet (~> 5.5.0)
bundler-audit (~> 0.5.0) bundler-audit (~> 0.5.0)
capybara (~> 2.6.2) capybara (~> 2.15.0)
capybara-screenshot (~> 1.0.0) capybara-screenshot (~> 1.0.0)
carrierwave (~> 1.1) carrierwave (~> 1.1)
charlock_holmes (~> 0.7.5) charlock_holmes (~> 0.7.5)
......
...@@ -115,9 +115,9 @@ feature 'Dashboard Projects' do ...@@ -115,9 +115,9 @@ feature 'Dashboard Projects' do
expect(page).to have_selector('.merge-request-form') expect(page).to have_selector('.merge-request-form')
expect(current_path).to eq project_new_merge_request_path(project) expect(current_path).to eq project_new_merge_request_path(project)
expect(find('#merge_request_target_project_id').value).to eq project.id.to_s expect(find('#merge_request_target_project_id', visible: false).value).to eq project.id.to_s
expect(find('input#merge_request_source_branch').value).to eq 'feature' expect(find('input#merge_request_source_branch', visible: false).value).to eq 'feature'
expect(find('input#merge_request_target_branch').value).to eq 'master' expect(find('input#merge_request_target_branch', visible: false).value).to eq 'master'
end end
end end
end end
...@@ -196,10 +196,11 @@ feature 'Diff notes resolve', js: true do ...@@ -196,10 +196,11 @@ feature 'Diff notes resolve', js: true do
end end
it 'does not mark discussion as resolved when resolving single note' do it 'does not mark discussion as resolved when resolving single note' do
page.first '.diff-content .note' do page.within("#note_#{note.id}") do
first('.line-resolve-btn').click first('.line-resolve-btn').click
expect(page).to have_selector('.note-action-button .loading') wait_for_requests
expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}") expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}")
end end
......
...@@ -14,7 +14,7 @@ feature 'User wants to create a file' do ...@@ -14,7 +14,7 @@ feature 'User wants to create a file' do
file_name = find('#file_name') file_name = find('#file_name')
file_name.set options[:file_name] || 'README.md' file_name.set options[:file_name] || 'README.md'
file_content = find('#file-content') file_content = find('#file-content', visible: false)
file_content.set options[:file_content] || 'Some content' file_content.set options[:file_content] || 'Some content'
click_button 'Commit changes' click_button 'Commit changes'
......
...@@ -295,7 +295,7 @@ describe "Search" do ...@@ -295,7 +295,7 @@ describe "Search" do
fill_in 'search', with: 'foo' fill_in 'search', with: 'foo'
click_button 'Search' click_button 'Search'
expect(find('#group_id').value).to eq(project.namespace.id.to_s) expect(find('#group_id', visible: false).value).to eq(project.namespace.id.to_s)
end end
it 'preserves the project being searched in' do it 'preserves the project being searched in' do
...@@ -304,7 +304,7 @@ describe "Search" do ...@@ -304,7 +304,7 @@ describe "Search" do
fill_in 'search', with: 'foo' fill_in 'search', with: 'foo'
click_button 'Search' click_button 'Search'
expect(find('#project_id').value).to eq(project.id.to_s) expect(find('#project_id', visible: false).value).to eq(project.id.to_s)
end end
end end
end end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册