diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 03:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-15 03:08:48 +0300 |
commit | b69f406585ff64b1c5140ebba775cc754fabb358 (patch) | |
tree | 9af7dfeb0c3f0f8db189a6e18c6be398a7729e2d /spec/lib/gitlab/data_builder | |
parent | 866ca4e49ff74ffadf8e6f6ff663a168489c2aba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/data_builder')
-rw-r--r-- | spec/lib/gitlab/data_builder/build_spec.rb | 12 | ||||
-rw-r--r-- | spec/lib/gitlab/data_builder/pipeline_spec.rb | 9 |
2 files changed, 19 insertions, 2 deletions
diff --git a/spec/lib/gitlab/data_builder/build_spec.rb b/spec/lib/gitlab/data_builder/build_spec.rb index fdb855de786..da27125c9a6 100644 --- a/spec/lib/gitlab/data_builder/build_spec.rb +++ b/spec/lib/gitlab/data_builder/build_spec.rb @@ -4,7 +4,8 @@ require 'spec_helper' describe Gitlab::DataBuilder::Build do let(:runner) { create(:ci_runner, :instance) } - let(:build) { create(:ci_build, :running, runner: runner) } + let(:user) { create(:user) } + let(:build) { create(:ci_build, :running, runner: runner, user: user) } describe '.build' do let(:data) do @@ -22,6 +23,15 @@ describe Gitlab::DataBuilder::Build do it { expect(data[:project_id]).to eq(build.project.id) } it { expect(data[:project_name]).to eq(build.project.full_name) } it { expect(data[:pipeline_id]).to eq(build.pipeline.id) } + it { + expect(data[:user]).to eq( + { + name: user.name, + username: user.username, + avatar_url: user.avatar_url(only_path: false), + email: user.email + }) + } it { expect(data[:commit][:id]).to eq(build.pipeline.id) } it { expect(data[:runner][:id]).to eq(build.runner.id) } it { expect(data[:runner][:description]).to eq(build.runner.description) } diff --git a/spec/lib/gitlab/data_builder/pipeline_spec.rb b/spec/lib/gitlab/data_builder/pipeline_spec.rb index 86ab7f888ca..da22da8de0f 100644 --- a/spec/lib/gitlab/data_builder/pipeline_spec.rb +++ b/spec/lib/gitlab/data_builder/pipeline_spec.rb @@ -11,7 +11,8 @@ describe Gitlab::DataBuilder::Pipeline do project: project, status: 'success', sha: project.commit.sha, - ref: project.default_branch) + ref: project.default_branch, + user: user) end let!(:build) { create(:ci_build, pipeline: pipeline) } @@ -37,6 +38,12 @@ describe Gitlab::DataBuilder::Pipeline do expect(build_data[:allow_failure]).to eq(build.allow_failure) expect(project_data).to eq(project.hook_attrs(backward: false)) expect(data[:merge_request]).to be_nil + expect(data[:user]).to eq({ + name: user.name, + username: user.username, + avatar_url: user.avatar_url(only_path: false), + email: user.email + }) end context 'pipeline without variables' do |