diff options
author | Josh Frye <joshfng@gmail.com> | 2016-05-26 14:49:25 +0000 |
---|---|---|
committer | Josh Frye <joshfng@gmail.com> | 2016-05-26 14:49:25 +0000 |
commit | 85495c8c85533e2d4156231fd2535270afffef5a (patch) | |
tree | ba76d51bcacce46b0a497100285a3f3a9103d2af /spec | |
parent | 24b24aff754e3c7fd9ba8306fc3a452338872276 (diff) | |
parent | d5e93deb012423697158576cfd1c22ed582cb23c (diff) | |
download | gitlab-ce-85495c8c85533e2d4156231fd2535270afffef5a.tar.gz |
Merge branch 'remove-main-language' into 'master'
Remove main_language and tests. Closes #14937
See merge request !4293
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/repository_spec.rb | 12 | ||||
-rw-r--r-- | spec/services/git_push_service_spec.rb | 43 |
2 files changed, 0 insertions, 55 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index 92ec51eabd4..8c2347992f1 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -829,18 +829,6 @@ describe Repository, models: true do end end - describe "#main_language" do - it 'shows the main language of the project' do - expect(repository.main_language).to eq("Ruby") - end - - it 'returns nil when the repository is empty' do - allow(repository).to receive(:empty?).and_return(true) - - expect(repository.main_language).to be_nil - end - end - describe '#before_remove_tag' do it 'flushes the tag cache' do expect(repository).to receive(:expire_tag_count_cache) diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index eeab540c2fd..18692f1279a 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -158,49 +158,6 @@ describe GitPushService, services: true do end end - describe "Updates main language" do - context "before push" do - it { expect(project.main_language).to eq(nil) } - end - - context "after push" do - def execute - execute_service(project, user, @oldrev, @newrev, ref) - end - - context "to master" do - let(:ref) { @ref } - - 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(project.main_language).to eq(nil) } - end - end - end - - describe "Updates git attributes" do context "for default branch" do it "calls the copy attributes method for the first push to the default branch" do |