adds test for git push service for updating the language of the project

2 files changed, 22 insertions, 3 deletions

diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index ab883b6ef2c..736b82e3571 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -51,16 +51,18 @@ class GitPushService < BaseService
     update_merge_requests
   end
 
-  protected
-
   def update_main_language
     current_language = @project.repository.main_language
 
     unless current_language == @project.main_language
-      @project.update_attributes(main_language: current_language)
+      return @project.update_attributes(main_language: current_language)
     end
+
+    true
   end
 
+  protected
+
   def update_merge_requests
     @project.update_merge_requests(params[:oldrev], params[:newrev], params[:ref], current_user)
 
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 994585fb32c..f5c51e46e8b 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -155,6 +155,23 @@ 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
+      before do
+        @service = execute_service(project, user, @oldrev, @newrev, @ref)
+      end
+
+      it { expect(@service.update_main_language).to eq(true) }
+      it { expect(project.main_language).to eq("Ruby") }
+    end
+  end
+
+
   describe "Web Hooks" do
     context "execute web hooks" do
       it "when pushing a branch for the first time" do