Extract EE specific files/lines for Discussion spec/services
This is part of moving GitLab to single codebase
This commit is contained in:
parent
ee72dc1b34
commit
703d62a549
1 changed files with 26 additions and 23 deletions
|
@ -1,6 +1,9 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe SystemNoteService do
|
||||
include ProjectForksHelper
|
||||
include Gitlab::Routing
|
||||
include RepoHelpers
|
||||
include AssetsHelpers
|
||||
|
@ -619,7 +622,7 @@ describe SystemNoteService do
|
|||
|
||||
context 'commit with cross-reference from fork' do
|
||||
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 }
|
||||
|
||||
before do
|
||||
|
@ -896,6 +899,28 @@ describe SystemNoteService do
|
|||
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
|
||||
let(:discussion) { create(:diff_note_on_merge_request, project: project).to_discussion }
|
||||
let(:merge_request) { discussion.noteable }
|
||||
|
@ -922,28 +947,6 @@ describe SystemNoteService do
|
|||
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
|
||||
# We need a custom noteable in order to the shared examples to be green.
|
||||
let(:noteable) do
|
||||
|
|
Loading…
Reference in a new issue