diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-18 19:15:05 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-18 19:15:05 +0300 |
commit | 1b9e2530de255aabd187b1a6460eefa650fa4acf (patch) | |
tree | caf3817ea0d92cbe3149fb565cae2b1e8c5dfabb /features | |
parent | 3639ebd081a6f008c2d0824953dc37168cf59200 (diff) | |
parent | a54bd0ff77fd31791208d1fd23e6169e0e72b331 (diff) |
Merge branch 'master' into edit-on-fork
# Conflicts:
# app/views/projects/tree/_tree_header.html.haml
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/forked_merge_requests.rb | 3 | ||||
-rw-r--r-- | features/steps/shared/diff_note.rb | 2 |
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 |