diff options
author | Drew Blessing <drew@gitlab.com> | 2016-04-05 17:44:13 -0500 |
---|---|---|
committer | Drew Blessing <drew@gitlab.com> | 2016-04-06 14:56:40 -0500 |
commit | 935bf7271d88c8623312004dd6cba791b76503f5 (patch) | |
tree | 3463f6b8d1729bf21b96c2b8c8614cf2e5388bea /spec | |
parent | 779b9eac57cf45d77e4d62aa1b96e06928daa794 (diff) | |
download | gitlab-ce-935bf7271d88c8623312004dd6cba791b76503f5.tar.gz |
Only update main language if it is not already setupdate_main_lang_if_unset
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/git_push_service_spec.rb | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index 1047e32960e..b40a5c1c818 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -164,21 +164,37 @@ describe GitPushService, services: true do end context "after push" do - before do - @service = execute_service(project, user, @oldrev, @newrev, ref) + def execute + execute_service(project, user, @oldrev, @newrev, ref) end context "to master" do let(:ref) { @ref } - it { expect(@service.update_main_language).to eq(true) } - it { expect(project.main_language).to eq("Ruby") } + context 'when main_language is nil' do + it 'obtains the language from the repository' do + expect(project.repository).to receive(:main_language) + execute + end + + it 'sets the project main language' do + execute + expect(project.main_language).to eq("Ruby") + end + end + + context 'when main_language is already set' do + it 'does not check the repository' do + execute # do an initial run to simulate lang being preset + expect(project.repository).not_to receive(:main_language) + execute + end + end end context "to other branch" do let(:ref) { 'refs/heads/feature/branch' } - it { expect(@service.update_main_language).to eq(nil) } it { expect(project.main_language).to eq(nil) } end end |