summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2016-12-20 15:44:24 +0100
committerRuben Davila <rdavila84@gmail.com>2017-01-15 11:10:04 -0500
commit64dd41a0e21360c380cab394f8a5c9b4945b7fd1 (patch)
treedc0cde8263d60786fbe05338790ccd186070f8fd /spec/features
parentf1bd9f05e2ca0c165f06c47c32d44f2951265e6e (diff)
downloadgitlab-ce-64dd41a0e21360c380cab394f8a5c9b4945b7fd1.tar.gz
Backport timetracking frontend to CE.
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/issues/user_uses_slash_commands_spec.rb26
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/features/issues/user_uses_slash_commands_spec.rb b/spec/features/issues/user_uses_slash_commands_spec.rb
index 31f75512f4a..f2d4aadf540 100644
--- a/spec/features/issues/user_uses_slash_commands_spec.rb
+++ b/spec/features/issues/user_uses_slash_commands_spec.rb
@@ -100,6 +100,32 @@ feature 'Issues > User uses slash commands', 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) }