diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-02-15 16:06:45 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-15 16:06:45 -0500 |
commit | 789aef7f26597f026859b2ddd29fab1120ce8abe (patch) | |
tree | b6292006b40c242c889c87df2ed6964b3d455906 /spec/lib | |
parent | c29517aaf420b0d83f21d468b371260f4887cf00 (diff) | |
download | gitlab-ce-789aef7f26597f026859b2ddd29fab1120ce8abe.tar.gz |
Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469
Closes #13469
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/gitlab/push_data_builder_spec.rb | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/spec/lib/gitlab/push_data_builder_spec.rb b/spec/lib/gitlab/push_data_builder_spec.rb index 3ef61685398..5ec9a84c5ab 100644 --- a/spec/lib/gitlab/push_data_builder_spec.rb +++ b/spec/lib/gitlab/push_data_builder_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' -describe 'Gitlab::PushDataBuilder', lib: true do +describe Gitlab::PushDataBuilder, lib: true do let(:project) { create(:project) } let(:user) { create(:user) } - describe :build_sample do - let(:data) { Gitlab::PushDataBuilder.build_sample(project, user) } + describe '.build_sample' do + let(:data) { described_class.build_sample(project, user) } it { expect(data).to be_a(Hash) } it { expect(data[:before]).to eq('6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') } @@ -22,13 +22,11 @@ describe 'Gitlab::PushDataBuilder', lib: true do it { expect(data[:commits].first[:removed]).to eq([]) } end - describe :build do + describe '.build' do let(:data) do - Gitlab::PushDataBuilder.build(project, - user, - Gitlab::Git::BLANK_SHA, - '8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b', - 'refs/tags/v1.1.0') + described_class.build(project, user, Gitlab::Git::BLANK_SHA, + '8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b', + 'refs/tags/v1.1.0') end it { expect(data).to be_a(Hash) } @@ -38,5 +36,10 @@ describe 'Gitlab::PushDataBuilder', lib: true do it { expect(data[:ref]).to eq('refs/tags/v1.1.0') } it { expect(data[:commits]).to be_empty } it { expect(data[:total_commits_count]).to be_zero } + + it 'does not raise an error when given nil commits' do + expect { described_class.build(spy, spy, spy, spy, spy, nil) }. + not_to raise_error + end end end |