summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-12 16:07:49 +0200
committerMichel Engelen <michel.engelen@diva-e.com>2019-06-12 16:07:49 +0200
commitd1ca1a513ca2d80ef5a06dcd85f03789e4a71b54 (patch)
tree0b3febda1df3dd002c674bb0d7e53b38e60bf715
parentc5619d235d021a56a0e8fec7d83c0e58302d2f93 (diff)
downloadgitlab-ce-d1ca1a513ca2d80ef5a06dcd85f03789e4a71b54.tar.gz
updated tests for !29553
-rw-r--r--spec/features/merge_request/user_suggests_changes_on_diff_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
index 04c7f4b6c76..c52a787325b 100644
--- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
+++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb
@@ -174,12 +174,12 @@ describe 'User comments on a diff', :js do
it 'resolves discussion when applied' do
page.within('.diff-discussions') do
- expect(page).not_to have_content('Unresolve discussion')
+ expect(page).not_to have_content('Unresolve thread')
click_button('Apply suggestion')
wait_for_requests
- expect(page).to have_content('Unresolve discussion')
+ expect(page).to have_content('Unresolve thread')
end
end
end