1 files changed, 18 insertions, 15 deletions
diff --git a/spec/requests/api/boards_spec.rb b/spec/requests/api/boards_spec.rb
index f698d5dddb3..fcfa4ddfbfe 100644
--- a/spec/requests/api/boards_spec.rb
+++ b/spec/requests/api/boards_spec.rb
@@ -1,34 +1,34 @@
 require 'spec_helper'
 
 describe API::Boards do
-  let(:user)        { create(:user) }
-  let(:user2)       { create(:user) }
-  let(:non_member)  { create(:user) }
-  let(:guest)       { create(:user) }
-  let(:admin)       { create(:user, :admin) }
-  let!(:project)    { create(:project, :public, creator_id: user.id, namespace: user.namespace ) }
-
-  let!(:dev_label) do
+  set(:user)        { create(:user) }
+  set(:user2)       { create(:user) }
+  set(:non_member)  { create(:user) }
+  set(:guest)       { create(:user) }
+  set(:admin)       { create(:user, :admin) }
+  set(:project)    { create(:project, :public, creator_id: user.id, namespace: user.namespace ) }
+
+  set(:dev_label) do
     create(:label, title: 'Development', color: '#FFAABB', project: project)
   end
 
-  let!(:test_label) do
+  set(:test_label) do
     create(:label, title: 'Testing', color: '#FFAACC', project: project)
   end
 
-  let!(:ux_label) do
+  set(:ux_label) do
     create(:label, title: 'UX', color: '#FF0000', project: project)
   end
 
-  let!(:dev_list) do
+  set(:dev_list) do
     create(:list, label: dev_label, position: 1)
   end
 
-  let!(:test_list) do
+  set(:test_list) do
     create(:list, label: test_label, position: 2)
   end
 
-  let!(:board) do
+  set(:board) do
     create(:board, project: project, lists: [dev_list, test_list])
   end
 
@@ -187,8 +187,11 @@ describe API::Boards do
     end
 
     context "when the user is project owner" do
-      let(:owner)     { create(:user) }
-      let(:project)   { create(:project, namespace: owner.namespace) }
+      set(:owner) { create(:user) }
+
+      before do
+        project.update(namespace: owner.namespace)
+      end
 
       it "deletes the list if an admin requests it" do
         delete api("#{base_url}/#{dev_list.id}", owner)