Merge branch 'reorder-language' into 'master'

Update language after doing all other operations

See merge request !3533

1 files changed, 14 insertions, 4 deletions

diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 8490a729e51..1047e32960e 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -159,18 +159,28 @@ describe GitPushService, services: true do
   end
 
   describe "Updates main language" do
-
     context "before push" do
       it { expect(project.main_language).to eq(nil) }
     end
 
     context "after push" do
       before do
-        @service = execute_service(project, user, @oldrev, @newrev, @ref)
+        @service = 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") }
       end
 
-      it { expect(@service.update_main_language).to eq(true) }
-      it { expect(project.main_language).to eq("Ruby") }
+      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
   end