diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-18 16:46:10 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-18 16:46:10 +0300 |
commit | 95a67cdbcfb52242a2736c79605e37a6d533640e (patch) | |
tree | de9ce40243fd12a47e82b3256a68d83d1fba15b1 /features | |
parent | 4163eb56d91f75f62d562034140b0b4debecb315 (diff) | |
parent | 08ddb8f7689ec0d50e6c28e90f5eb7ab107fd0d3 (diff) |
Merge branch 'master' into branch-invalid-name
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 |