From b82fdf6257255b720526ccef716759892e88de09 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 20 Dec 2016 17:52:27 +0100
Subject: Fix error 500 renaming group. Also added specs and changelog.

---
 spec/services/groups/update_service_spec.rb | 49 ++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 7 deletions(-)

(limited to 'spec/services/groups/update_service_spec.rb')

diff --git a/spec/services/groups/update_service_spec.rb b/spec/services/groups/update_service_spec.rb
index 9c2331144a0..8ac5736cbb3 100644
--- a/spec/services/groups/update_service_spec.rb
+++ b/spec/services/groups/update_service_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe Groups::UpdateService, services: true do
-  let!(:user)             { create(:user) }
-  let!(:private_group)    { create(:group, :private) }
-  let!(:internal_group)   { create(:group, :internal) }
-  let!(:public_group)     { create(:group, :public) }
+  let!(:user) { create(:user) }
+  let!(:private_group) { create(:group, :private) }
+  let!(:internal_group) { create(:group, :internal) }
+  let!(:public_group) { create(:group, :public) }
 
   describe "#execute" do
     context "project visibility_level validation" do
       context "public group with public projects" do
-        let!(:service) { described_class.new(public_group, user, visibility_level: Gitlab::VisibilityLevel::INTERNAL ) }
+        let!(:service) { described_class.new(public_group, user, visibility_level: Gitlab::VisibilityLevel::INTERNAL) }
 
         before do
           public_group.add_user(user, Gitlab::Access::MASTER)
@@ -23,7 +23,7 @@ describe Groups::UpdateService, services: true do
       end
 
       context "internal group with internal project" do
-        let!(:service) { described_class.new(internal_group, user, visibility_level: Gitlab::VisibilityLevel::PRIVATE ) }
+        let!(:service) { described_class.new(internal_group, user, visibility_level: Gitlab::VisibilityLevel::PRIVATE) }
 
         before do
           internal_group.add_user(user, Gitlab::Access::MASTER)
@@ -39,7 +39,7 @@ describe Groups::UpdateService, services: true do
   end
 
   context "unauthorized visibility_level validation" do
-    let!(:service) { described_class.new(internal_group, user, visibility_level: 99 ) }
+    let!(:service) { described_class.new(internal_group, user, visibility_level: 99) }
     before do
       internal_group.add_user(user, Gitlab::Access::MASTER)
     end
@@ -49,4 +49,39 @@ describe Groups::UpdateService, services: true do
       expect(internal_group.errors.count).to eq(1)
     end
   end
+
+  context 'rename group' do
+    let!(:service) { described_class.new(internal_group, user, path: 'new_path') }
+
+    before do
+      internal_group.add_user(user, Gitlab::Access::MASTER)
+      create(:project, :internal, group: internal_group)
+    end
+
+    it 'returns true' do
+      puts internal_group.errors.full_messages
+
+      expect(service.execute).to eq(true)
+    end
+
+    context 'error moving group' do
+      before do
+        allow(internal_group).to receive(:move_dir).and_raise(Gitlab::UpdatePathError)
+      end
+
+      it 'does not raise an error' do
+        expect { service.execute }.not_to raise_error
+      end
+
+      it 'returns false' do
+        expect(service.execute).to eq(false)
+      end
+
+      it 'has the right error' do
+        service.execute
+
+        expect(internal_group.errors.full_messages.first).to eq('Gitlab::UpdatePathError')
+      end
+    end
+  end
 end
-- 
cgit v1.2.1