Fix specs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 21 insertions, 24 deletions

diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb
index dea90b2bfa7..be277b4dbd2 100644
--- a/spec/observers/users_project_observer_spec.rb
+++ b/spec/observers/users_project_observer_spec.rb
@@ -47,30 +47,6 @@ describe UsersProjectObserver do
   end
 
   describe "#after_create" do
-    context 'wiki_enabled creates repository directory' do
-      context 'wiki_enabled true creates wiki repository directory' do
-        before do
-          @project = create(:project, wiki_enabled: true)
-          @path = GollumWiki.new(@project, user).send(:path_to_repo)
-        end
-
-        after do
-          FileUtils.rm_rf(@path)
-        end
-
-        it { File.exists?(@path).should be_true }
-      end
-
-      context 'wiki_enabled false does not create wiki repository directory' do
-        before do
-          @project = create(:project, wiki_enabled: false)
-          @path = GollumWiki.new(@project, user).send(:path_to_repo)
-        end
-
-        it { File.exists?(@path).should be_false }
-      end
-    end
-
     it "should send email to user" do
       subject.should_receive(:notification)
       Event.stub(create: true)
diff --git a/spec/services/projects_create_service_spec.rb b/spec/services/projects_create_service_spec.rb
index 0a41832a211..f2a784df103 100644
--- a/spec/services/projects_create_service_spec.rb
+++ b/spec/services/projects_create_service_spec.rb
@@ -38,6 +38,27 @@ describe Projects::CreateService do
       it { @project.namespace.should == @group }
     end
 
+    context 'wiki_enabled creates repository directory' do
+      context 'wiki_enabled true creates wiki repository directory' do
+        before do
+          @project = create_project(@user, @opts)
+          @path = GollumWiki.new(@project, @user).send(:path_to_repo)
+        end
+
+        it { File.exists?(@path).should be_true }
+      end
+
+      context 'wiki_enabled false does not create wiki repository directory' do
+        before do
+          @opts.merge!(wiki_enabled: false)
+          @project = create_project(@user, @opts)
+          @path = GollumWiki.new(@project, @user).send(:path_to_repo)
+        end
+
+        it { File.exists?(@path).should be_false }
+      end
+    end
+
     context 'respect configured visibility setting' do
       before(:each) do
         @settings = double("settings")