diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/models/event_spec.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/models/event_spec.rb')
-rw-r--r-- | spec/models/event_spec.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 015a86cb28b..bafcb7a3741 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -81,6 +81,8 @@ RSpec.describe Event do describe 'validations' do describe 'action' do context 'for a design' do + let_it_be(:author) { create(:user) } + where(:action, :valid) do valid = described_class::DESIGN_ACTIONS.map(&:to_s).to_set @@ -90,7 +92,7 @@ RSpec.describe Event do end with_them do - let(:event) { build(:design_event, action: action) } + let(:event) { build(:design_event, author: author, action: action) } specify { expect(event.valid?).to eq(valid) } end @@ -722,9 +724,17 @@ RSpec.describe Event do note_on_commit: true } valid_target_factories.map do |kind, needs_project| - extra_data = needs_project ? { project: project } : {} + extra_data = if kind == :merge_request + { source_project: project } + elsif needs_project + { project: project } + else + {} + end + target = kind == :project ? nil : build(kind, **extra_data) - [kind, build(:event, :created, project: project, target: target)] + + [kind, build(:event, :created, author: project.owner, project: project, target: target)] end.to_h end |