diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-18 18:10:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-18 18:10:16 +0300 |
commit | c8cc2fe990c52cabcb9912b2b01b5bf16b33d88f (patch) | |
tree | 101b52764100d09d0f49e9277cfd7ac5383e7aeb /spec/serializers | |
parent | 38a1a6cb91bd4cd95d18db9a4bfd219bfb75401b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/merge_request_diff_entity_spec.rb | 2 | ||||
-rw-r--r-- | spec/serializers/service_event_entity_spec.rb | 6 | ||||
-rw-r--r-- | spec/serializers/service_field_entity_spec.rb | 19 |
3 files changed, 15 insertions, 12 deletions
diff --git a/spec/serializers/merge_request_diff_entity_spec.rb b/spec/serializers/merge_request_diff_entity_spec.rb index 9bf95e68874..fae0cd7a0f9 100644 --- a/spec/serializers/merge_request_diff_entity_spec.rb +++ b/spec/serializers/merge_request_diff_entity_spec.rb @@ -29,7 +29,7 @@ RSpec.describe MergeRequestDiffEntity do expect(subject).to include( :version_index, :created_at, :commits_count, :latest, :short_commit_sha, :version_path, - :compare_path + :compare_path, :state ) end end diff --git a/spec/serializers/service_event_entity_spec.rb b/spec/serializers/service_event_entity_spec.rb index 91254c7dd27..f610c8f1488 100644 --- a/spec/serializers/service_event_entity_spec.rb +++ b/spec/serializers/service_event_entity_spec.rb @@ -12,7 +12,7 @@ RSpec.describe ServiceEventEntity do end describe '#as_json' do - context 'service without fields' do + context 'integration without fields' do let(:integration) { create(:emails_on_push_integration, push_events: true) } let(:event) { 'push' } @@ -24,8 +24,8 @@ RSpec.describe ServiceEventEntity do end end - context 'service with fields' do - let(:integration) { create(:slack_service, note_events: false, note_channel: 'note-channel') } + context 'integration with fields' do + let(:integration) { create(:integrations_slack, note_events: false, note_channel: 'note-channel') } let(:event) { 'note' } it 'exposes correct attributes' do diff --git a/spec/serializers/service_field_entity_spec.rb b/spec/serializers/service_field_entity_spec.rb index 20ca98416f8..6e9ebfb66d9 100644 --- a/spec/serializers/service_field_entity_spec.rb +++ b/spec/serializers/service_field_entity_spec.rb @@ -5,18 +5,18 @@ require 'spec_helper' RSpec.describe ServiceFieldEntity do let(:request) { double('request') } - subject { described_class.new(field, request: request, service: service).as_json } + subject { described_class.new(field, request: request, service: integration).as_json } before do - allow(request).to receive(:service).and_return(service) + allow(request).to receive(:service).and_return(integration) end describe '#as_json' do context 'Jira Service' do - let(:service) { create(:jira_service) } + let(:integration) { create(:jira_integration) } context 'field with type text' do - let(:field) { service.global_fields.find { |field| field[:name] == 'username' } } + let(:field) { integration_field('username') } it 'exposes correct attributes' do expected_hash = { @@ -35,7 +35,7 @@ RSpec.describe ServiceFieldEntity do end context 'field with type password' do - let(:field) { service.global_fields.find { |field| field[:name] == 'password' } } + let(:field) { integration_field('password') } it 'exposes correct attributes but hides password' do expected_hash = { @@ -56,10 +56,9 @@ RSpec.describe ServiceFieldEntity do context 'EmailsOnPush Service' do let(:integration) { create(:emails_on_push_integration, send_from_committer_email: '1') } - let(:service) { integration } # TODO: remove when https://gitlab.com/gitlab-org/gitlab/-/issues/330300 is complete context 'field with type checkbox' do - let(:field) { integration.global_fields.find { |field| field[:name] == 'send_from_committer_email' } } + let(:field) { integration_field('send_from_committer_email') } it 'exposes correct attributes and casts value to Boolean' do expected_hash = { @@ -78,7 +77,7 @@ RSpec.describe ServiceFieldEntity do end context 'field with type select' do - let(:field) { integration.global_fields.find { |field| field[:name] == 'branches_to_be_notified' } } + let(:field) { integration_field('branches_to_be_notified') } it 'exposes correct attributes' do expected_hash = { @@ -97,4 +96,8 @@ RSpec.describe ServiceFieldEntity do end end end + + def integration_field(name) + integration.global_fields.find { |f| f[:name] == name } + end end |