summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-12 16:07:49 +0200
committerMichel Engelen <michel@nomorejs.net>2019-07-02 14:29:03 +0200
commit0ee03c9a81288d0f3e597b7747f2bc3826a5d74d (patch)
tree6b19b190026589f2c35a592e3866e85fbdc8626e /spec
parent4cb99ffa2803c8e94544cefe80ab47b032df2226 (diff)
downloadgitlab-ce-0ee03c9a81288d0f3e597b7747f2bc3826a5d74d.tar.gz
updated tests for !29553
Diffstat (limited to 'spec')
-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 e8b4fc8f160..4363b359038 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
@@ -186,12 +186,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