Commit 703d62a5 authored by Felipe Artur's avatar Felipe Artur

Extract EE specific files/lines for Discussion spec/services

This is part of moving GitLab to single codebase
parent ee72dc1b
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe SystemNoteService do describe SystemNoteService do
include ProjectForksHelper
include Gitlab::Routing include Gitlab::Routing
include RepoHelpers include RepoHelpers
include AssetsHelpers include AssetsHelpers
...@@ -619,7 +622,7 @@ describe SystemNoteService do ...@@ -619,7 +622,7 @@ describe SystemNoteService do
context 'commit with cross-reference from fork' do context 'commit with cross-reference from fork' do
let(:author2) { create(:project_member, :reporter, user: create(:user), project: project).user } let(:author2) { create(:project_member, :reporter, user: create(:user), project: project).user }
let(:forked_project) { Projects::ForkService.new(project, author2).execute } let(:forked_project) { fork_project(project, author2, repository: true) }
let(:commit2) { forked_project.commit } let(:commit2) { forked_project.commit }
before do before do
...@@ -896,6 +899,28 @@ describe SystemNoteService do ...@@ -896,6 +899,28 @@ describe SystemNoteService do
end end
end end
describe '.change_time_estimate' do
subject { described_class.change_time_estimate(noteable, project, author) }
it_behaves_like 'a system note' do
let(:action) { 'time_tracking' }
end
context 'with a time estimate' do
it 'sets the note text' do
noteable.update_attribute(:time_estimate, 277200)
expect(subject.note).to eq "changed time estimate to 1w 4d 5h"
end
end
context 'without a time estimate' do
it 'sets the note text' do
expect(subject.note).to eq "removed time estimate"
end
end
end
describe '.discussion_continued_in_issue' do describe '.discussion_continued_in_issue' do
let(:discussion) { create(:diff_note_on_merge_request, project: project).to_discussion } let(:discussion) { create(:diff_note_on_merge_request, project: project).to_discussion }
let(:merge_request) { discussion.noteable } let(:merge_request) { discussion.noteable }
...@@ -922,28 +947,6 @@ describe SystemNoteService do ...@@ -922,28 +947,6 @@ describe SystemNoteService do
end end
end end
describe '.change_time_estimate' do
subject { described_class.change_time_estimate(noteable, project, author) }
it_behaves_like 'a system note' do
let(:action) { 'time_tracking' }
end
context 'with a time estimate' do
it 'sets the note text' do
noteable.update_attribute(:time_estimate, 277200)
expect(subject.note).to eq "changed time estimate to 1w 4d 5h"
end
end
context 'without a time estimate' do
it 'sets the note text' do
expect(subject.note).to eq "removed time estimate"
end
end
end
describe '.change_time_spent' do describe '.change_time_spent' do
# We need a custom noteable in order to the shared examples to be green. # We need a custom noteable in order to the shared examples to be green.
let(:noteable) do let(:noteable) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment