diff options
Diffstat (limited to 'spec/lib/gitlab/data_builder')
-rw-r--r-- | spec/lib/gitlab/data_builder/build_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/data_builder/pipeline_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/data_builder/wiki_page_spec.rb | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/spec/lib/gitlab/data_builder/build_spec.rb b/spec/lib/gitlab/data_builder/build_spec.rb index a31e5a1d1e2..325fdb90929 100644 --- a/spec/lib/gitlab/data_builder/build_spec.rb +++ b/spec/lib/gitlab/data_builder/build_spec.rb @@ -47,6 +47,8 @@ RSpec.describe Gitlab::DataBuilder::Build do it { expect(data[:runner][:id]).to eq(build.runner.id) } it { expect(data[:runner][:tags]).to match_array(tag_names) } it { expect(data[:runner][:description]).to eq(build.runner.description) } + it { expect(data[:runner][:runner_type]).to eq(build.runner.runner_type) } + it { expect(data[:runner][:is_shared]).to eq(build.runner.instance_type?) } it { expect(data[:environment]).to be_nil } context 'commit author_url' do diff --git a/spec/lib/gitlab/data_builder/pipeline_spec.rb b/spec/lib/gitlab/data_builder/pipeline_spec.rb index bec1e612c02..c05a044f0de 100644 --- a/spec/lib/gitlab/data_builder/pipeline_spec.rb +++ b/spec/lib/gitlab/data_builder/pipeline_spec.rb @@ -58,8 +58,10 @@ RSpec.describe Gitlab::DataBuilder::Pipeline do it 'has runner attributes', :aggregate_failures do expect(runner_data[:id]).to eq(ci_runner.id) expect(runner_data[:description]).to eq(ci_runner.description) + expect(runner_data[:runner_type]).to eq(ci_runner.runner_type) expect(runner_data[:active]).to eq(ci_runner.active) expect(runner_data[:tags]).to match_array(tag_names) + expect(runner_data[:is_shared]).to eq(ci_runner.instance_type?) end end diff --git a/spec/lib/gitlab/data_builder/wiki_page_spec.rb b/spec/lib/gitlab/data_builder/wiki_page_spec.rb index ec768cf9719..276ddb1e0af 100644 --- a/spec/lib/gitlab/data_builder/wiki_page_spec.rb +++ b/spec/lib/gitlab/data_builder/wiki_page_spec.rb @@ -4,8 +4,8 @@ require 'spec_helper' RSpec.describe Gitlab::DataBuilder::WikiPage do let_it_be(:project) { create(:project, :repository, :wiki_repo) } - let(:wiki_page) { create(:wiki_page, wiki: project.wiki) } - let(:user) { create(:user) } + let_it_be(:wiki_page) { create(:wiki_page, wiki: project.wiki) } + let_it_be(:user) { create(:user) } describe '.build' do let(:data) { described_class.build(wiki_page, user, 'create') } @@ -19,5 +19,6 @@ RSpec.describe Gitlab::DataBuilder::WikiPage do it { expect(data[:object_attributes]).to include(wiki_page.hook_attrs) } it { expect(data[:object_attributes]).to include(url: Gitlab::UrlBuilder.build(wiki_page)) } it { expect(data[:object_attributes]).to include(action: 'create') } + it { expect(data[:object_attributes]).to include(diff_url: Gitlab::UrlBuilder.build(wiki_page, action: :diff, version_id: wiki_page.version.id)) } end end |