summaryrefslogtreecommitdiff
path: root/spec/features/merge_request
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-03-07 12:34:05 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-03-07 12:34:05 +0000
commit41c6252111ef21daef2515119ed7791e43d64f49 (patch)
treef6b9edcfb34f8bd451afe7d6a87649ea9de7dc26 /spec/features/merge_request
parente382611d3b5ea2f8c2bd6b6aa54b0f69702bff21 (diff)
parent66f25ea6c44fb1d73e437a2d33ef1a926d778c11 (diff)
downloadgitlab-ce-41c6252111ef21daef2515119ed7791e43d64f49.tar.gz
Merge branch 'winh-enable-reply_to_individual_notes' into 'master'
Enable reply_to_individual_notes feature flag by default Closes #30299 See merge request gitlab-org/gitlab-ce!25575
Diffstat (limited to 'spec/features/merge_request')
-rw-r--r--spec/features/merge_request/user_posts_notes_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/features/merge_request/user_posts_notes_spec.rb b/spec/features/merge_request/user_posts_notes_spec.rb
index 1bbcf455ac7..dc0862be6fc 100644
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -67,7 +67,7 @@ describe 'Merge request > User posts notes', :js do
end
end
- describe 'when reply_to_individual_notes feature flag is not set' do
+ describe 'when reply_to_individual_notes feature flag is disabled' do
before do
stub_feature_flags(reply_to_individual_notes: false)
visit project_merge_request_path(project, merge_request)
@@ -78,9 +78,8 @@ describe 'Merge request > User posts notes', :js do
end
end
- describe 'when reply_to_individual_notes feature flag is set' do
+ describe 'when reply_to_individual_notes feature flag is not set' do
before do
- stub_feature_flags(reply_to_individual_notes: true)
visit project_merge_request_path(project, merge_request)
end