Merge branch 'rs-move-mr-slash-command-spec-from-issues' into 'master'

Move a spec related to merge requests out of a feature related to issues

See merge request !13002

spec/features/issues/user_uses_slash_commands_spec.rb

@@ -21,6 +21,16 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
       wait_for_requests
     end
+    describe 'time tracking' do
+      let(:issue) { create(:issue, project: project) }
+
+      before do
+        visit project_issue_path(project, issue)
+      end
+
+      it_behaves_like 'issuable time tracker'
+    end
+
     describe 'adding a due date from note' do
       let(:issue) { create(:issue, project: project) }
@@ -99,32 +109,6 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
       end
     end
-    describe 'Issuable time tracking' do
-      let(:issue) { create(:issue, project: project) }
-
-      before do
-        project.team << [user, :developer]
-      end
-
-      context 'Issue' do
-        before do
-          visit project_issue_path(project, issue)
-        end
-
-        it_behaves_like 'issuable time tracker'
-      end
-
-      context 'Merge Request' do
-        let(:merge_request) { create(:merge_request, source_project: project) }
-
-        before do
-          visit project_merge_request_path(project, merge_request)
-        end
-
-        it_behaves_like 'issuable time tracker'
-      end
-    end
-
     describe 'toggling the WIP prefix from the title from note' do
       let(:issue) { create(:issue, project: project) }

spec/features/merge_requests/user_uses_slash_commands_spec.rb

@@ -24,6 +24,14 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
       wait_for_requests
     end
+    describe 'time tracking' do
+      before do
+        visit project_merge_request_path(project, merge_request)
+      end
+
+      it_behaves_like 'issuable time tracker'
+    end
+
     describe 'toggling the WIP prefix in the title from note' do
       context 'when the current user can toggle the WIP prefix' do
         it 'adds the WIP: prefix to the title' do