summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRubén Dávila <Ruben@GitLab.com>2015-12-16 14:55:48 -0500
committerRubén Dávila <Ruben@GitLab.com>2015-12-17 01:01:08 -0500
commita4e0c7c7d6b34fbfeeffe544189d20ca5444414b (patch)
treea4788c25cff883a6ad1ae45c0c57eb41c103d461 /features
parent9ede66f619bb030ad351a7abf7b1be2148de7f99 (diff)
downloadgitlab-ce-a4e0c7c7d6b34fbfeeffe544189d20ca5444414b.tar.gz
Upgrade Poltergeist to 1.8.1. #4131issue_4131
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/forked_merge_requests.rb3
-rw-r--r--features/steps/shared/diff_note.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index d3675060994..cbdce78dc0c 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -41,7 +41,8 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
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"
end
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index dd466cde28d..c6a0ae2ba38 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -166,7 +166,7 @@ module SharedDiffNote
end
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
step 'I should see an empty diff comment form' do