diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-01 14:27:39 -0500 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
commit | dab4ac54b691f1c832b1fe444859c3183a231411 (patch) | |
tree | 0e3cd6fe0fc30060e19090bc18ab753731f23e1f /features | |
parent | 3cfeb3755828871813cd12c771fa7efddf67edb5 (diff) | |
download | gitlab-ce-dab4ac54b691f1c832b1fe444859c3183a231411.tar.gz |
Diff design updates
Diffstat (limited to 'features')
-rw-r--r-- | features/project/commits/diff_comments.feature | 7 | ||||
-rw-r--r-- | features/steps/shared/diff_note.rb | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature index fdaa9e7a473..1dda2ff8a6d 100644 --- a/features/project/commits/diff_comments.feature +++ b/features/project/commits/diff_comments.feature @@ -57,10 +57,9 @@ Feature: Project Commits Diff Comments Then I should see two separate previews @javascript - Scenario: I have can reply in discussions + Scenario: I have a reply button in discussions Given I leave a diff comment like "Typo, please fix" - Then I should see a discussion reply text field - + Then I should see a discussion reply button @javascript Scenario: I can preview with text Given I open a diff comment form @@ -83,7 +82,7 @@ Feature: Project Commits Diff Comments Given I preview a diff comment text like "Should fix it :smile:" And I submit the diff comment Then I should not see the diff comment form - And I should see a discussion reply text field + And I should see a discussion reply button @javascript Scenario: I can add a comment on a side-by-side commit diff (left side) diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb index 05e5ee151ad..1448c3f44cc 100644 --- a/features/steps/shared/diff_note.rb +++ b/features/steps/shared/diff_note.rb @@ -153,9 +153,9 @@ module SharedDiffNote end end - step 'I should see a discussion reply text field' do + step 'I should see a discussion reply button' do page.within(diff_file_selector) do - expect(page).to have_css('.note-reply-field') + expect(page).to have_button('Reply...') end end |