diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-21 15:21:46 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-21 15:21:46 +0000 |
commit | 9ed544035fcda156e1b6c782eb4c8c77128d1337 (patch) | |
tree | 8062e915be5920b5faa065df8397a37e2089dee5 | |
parent | 1ce523c1331e7e541f41d8733d1b9d7f729dcca5 (diff) | |
parent | 72d57db1cbe2ee77bda86de753590ae61c67c0f1 (diff) | |
download | gitlab-ce-9ed544035fcda156e1b6c782eb4c8c77128d1337.tar.gz |
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
-rw-r--r-- | spec/features/issues/user_uses_slash_commands_spec.rb | 36 | ||||
-rw-r--r-- | spec/features/merge_requests/user_uses_slash_commands_spec.rb | 8 |
2 files changed, 18 insertions, 26 deletions
diff --git a/spec/features/issues/user_uses_slash_commands_spec.rb b/spec/features/issues/user_uses_slash_commands_spec.rb index 1cd1f016674..4740402dc01 100644 --- a/spec/features/issues/user_uses_slash_commands_spec.rb +++ b/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) } diff --git a/spec/features/merge_requests/user_uses_slash_commands_spec.rb b/spec/features/merge_requests/user_uses_slash_commands_spec.rb index 434f5a7c0ac..b2187e01bdb 100644 --- a/spec/features/merge_requests/user_uses_slash_commands_spec.rb +++ b/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 |