summaryrefslogtreecommitdiff
path: root/spec/features/notes_on_merge_requests_spec.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-22 22:44:32 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-22 22:44:32 +0300
commitebe2a34a6b81f468187a8049ddae8242b00d1ebe (patch)
treef5e08e79921643d664f9e790b12ccb259385248b /spec/features/notes_on_merge_requests_spec.rb
parentb192aa5694b8df233124c4be58802a9100b0c321 (diff)
downloadgitlab-ce-ebe2a34a6b81f468187a8049ddae8242b00d1ebe.tar.gz
Add missing feature flag to mr notes spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/features/notes_on_merge_requests_spec.rb')
-rw-r--r--spec/features/notes_on_merge_requests_spec.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index cfb6deb1834..45aebf128c2 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -132,7 +132,7 @@ describe "On a merge request", js: true, feature: true do
end
end
-describe "On a merge request diff", js: true do
+describe "On a merge request diff", js: true, feature: true do
let(:merge_request) { create(:merge_request, :with_diffs, :simple) }
let(:project) { merge_request.source_project }
@@ -210,9 +210,3 @@ describe "On a merge request diff", js: true do
end
end
end
-
-describe "On merge request discussion", js: true do
- describe "with merge request diff note"
- describe "with commit note"
- describe "with commit diff note"
-end