Upgrade Poltergeist to 1.8.1. #4131
This commit is contained in:
parent
9ede66f619
commit
a4e0c7c7d6
2
Gemfile
2
Gemfile
|
@ -251,7 +251,7 @@ group :development, :test do
|
||||||
|
|
||||||
gem 'capybara', '~> 2.4.0'
|
gem 'capybara', '~> 2.4.0'
|
||||||
gem 'capybara-screenshot', '~> 1.0.0'
|
gem 'capybara-screenshot', '~> 1.0.0'
|
||||||
gem 'poltergeist', '~> 1.6.0'
|
gem 'poltergeist', '~> 1.8.1'
|
||||||
|
|
||||||
gem 'teaspoon', '~> 1.0.0'
|
gem 'teaspoon', '~> 1.0.0'
|
||||||
gem 'teaspoon-jasmine', '~> 2.2.0'
|
gem 'teaspoon-jasmine', '~> 2.2.0'
|
||||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -405,7 +405,7 @@ GEM
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mimemagic (0.3.0)
|
mimemagic (0.3.0)
|
||||||
mini_portile (0.6.2)
|
mini_portile2 (2.0.0)
|
||||||
minitest (5.7.0)
|
minitest (5.7.0)
|
||||||
mousetrap-rails (1.4.6)
|
mousetrap-rails (1.4.6)
|
||||||
multi_json (1.11.2)
|
multi_json (1.11.2)
|
||||||
|
@ -420,8 +420,8 @@ GEM
|
||||||
grape
|
grape
|
||||||
newrelic_rpm
|
newrelic_rpm
|
||||||
newrelic_rpm (3.9.4.245)
|
newrelic_rpm (3.9.4.245)
|
||||||
nokogiri (1.6.6.4)
|
nokogiri (1.6.7)
|
||||||
mini_portile (~> 0.6.0)
|
mini_portile2 (~> 2.0.0.rc2)
|
||||||
nprogress-rails (0.1.6.7)
|
nprogress-rails (0.1.6.7)
|
||||||
oauth (0.4.7)
|
oauth (0.4.7)
|
||||||
oauth2 (1.0.0)
|
oauth2 (1.0.0)
|
||||||
|
@ -488,7 +488,7 @@ GEM
|
||||||
parser (2.2.3.0)
|
parser (2.2.3.0)
|
||||||
ast (>= 1.1, < 3.0)
|
ast (>= 1.1, < 3.0)
|
||||||
pg (0.18.4)
|
pg (0.18.4)
|
||||||
poltergeist (1.6.0)
|
poltergeist (1.8.1)
|
||||||
capybara (~> 2.1)
|
capybara (~> 2.1)
|
||||||
cliver (~> 0.3.1)
|
cliver (~> 0.3.1)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
@ -905,7 +905,7 @@ DEPENDENCIES
|
||||||
org-ruby (~> 0.9.12)
|
org-ruby (~> 0.9.12)
|
||||||
paranoia (~> 2.0)
|
paranoia (~> 2.0)
|
||||||
pg (~> 0.18.2)
|
pg (~> 0.18.2)
|
||||||
poltergeist (~> 1.6.0)
|
poltergeist (~> 1.8.1)
|
||||||
pry-rails
|
pry-rails
|
||||||
quiet_assets (~> 1.0.2)
|
quiet_assets (~> 1.0.2)
|
||||||
rack-attack (~> 4.3.0)
|
rack-attack (~> 4.3.0)
|
||||||
|
|
|
@ -41,7 +41,8 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
|
||||||
|
|
||||||
click_button "Compare branches and continue"
|
click_button "Compare branches and continue"
|
||||||
|
|
||||||
expect(page).to have_content "New Merge Request"
|
expect(page).to have_css("h3.page-title", text: "New Merge Request")
|
||||||
|
|
||||||
fill_in "merge_request_title", with: "Merge Request On Forked Project"
|
fill_in "merge_request_title", with: "Merge Request On Forked Project"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -166,7 +166,7 @@ module SharedDiffNote
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see add a diff comment button' do
|
step 'I should see add a diff comment button' do
|
||||||
expect(page).to have_css('.js-add-diff-note-button', visible: true)
|
expect(page).to have_css('.js-add-diff-note-button')
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see an empty diff comment form' do
|
step 'I should see an empty diff comment form' do
|
||||||
|
|
Loading…
Reference in New Issue