diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-06-21 18:45:52 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-06-29 12:18:23 -0400 |
commit | 7b674d5d55ac07d3261f9788bc2d2c17ec8b7513 (patch) | |
tree | 6fc58fdf6b6684730a4961e07f22ea8e614b81a0 /spec | |
parent | e939bf7be10b6ec516ffbe75ad4b4dc1151670a7 (diff) | |
download | gitlab-ce-7b674d5d55ac07d3261f9788bc2d2c17ec8b7513.tar.gz |
Remove a duplicated test block from the result of a conflict resolution
This was mistakenly added in 17196a2ff31 and is identical to the group
above it.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues/user_uses_slash_commands_spec.rb | 26 |
1 files changed, 0 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 d0a7a418208..da09087766c 100644 --- a/spec/features/issues/user_uses_slash_commands_spec.rb +++ b/spec/features/issues/user_uses_slash_commands_spec.rb @@ -125,32 +125,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 namespace_project_issue_path(project.namespace, 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 namespace_project_merge_request_path(project.namespace, 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) } |