summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-03-31 16:34:21 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-07 15:33:18 -0700
commit87b3c73ea560d6091a17e7b759864b90911f5f1c (patch)
tree8d42b785e296bb39bc8425b77b9acd93c5b2d9ce /features
parentde63de18d77624d49b6a9d150f2581be0ac55e00 (diff)
downloadgitlab-ce-87b3c73ea560d6091a17e7b759864b90911f5f1c.tar.gz
Update diff_comments tests
Diffstat (limited to 'features')
-rw-r--r--features/project/commits/diff_comments.feature6
-rw-r--r--features/steps/shared/diff_note.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/features/project/commits/diff_comments.feature b/features/project/commits/diff_comments.feature
index 2bde4c8a99b..fdaa9e7a473 100644
--- a/features/project/commits/diff_comments.feature
+++ b/features/project/commits/diff_comments.feature
@@ -57,9 +57,9 @@ Feature: Project Commits Diff Comments
Then I should see two separate previews
@javascript
- Scenario: I have a reply button in discussions
+ Scenario: I have can reply in discussions
Given I leave a diff comment like "Typo, please fix"
- Then I should see a discussion reply button
+ Then I should see a discussion reply text field
@javascript
Scenario: I can preview with text
@@ -83,7 +83,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 button
+ And I should see a discussion reply text field
@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 32c3e99f450..05e5ee151ad 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 button' do
+ step 'I should see a discussion reply text field' do
page.within(diff_file_selector) do
- expect(page).to have_button('Reply')
+ expect(page).to have_css('.note-reply-field')
end
end