Fix api specs. Use id instead path

7 files changed, 25 insertions, 39 deletions

diff --git a/spec/lib/project_mover_spec.rb b/spec/lib/project_mover_spec.rb
index 2362bc2667b..28323b24ef6 100644
--- a/spec/lib/project_mover_spec.rb
+++ b/spec/lib/project_mover_spec.rb
@@ -5,6 +5,7 @@ describe Gitlab::ProjectMover do
 
   before do
     FileUtils.rm_rf base_path if File.exists? base_path
+    FileUtils.mkdir_p base_path
 
     Gitlab.config.gitolite.stub(repos_path: base_path)
 
diff --git a/spec/observers/user_observer_spec.rb b/spec/observers/user_observer_spec.rb
index 4ba0f05df5d..befb980fdcb 100644
--- a/spec/observers/user_observer_spec.rb
+++ b/spec/observers/user_observer_spec.rb
@@ -6,10 +6,7 @@ describe UserObserver do
   it 'calls #after_create when new users are created' do
     new_user = build(:user)
     subject.should_receive(:after_create).with(new_user)
-
-    User.observers.enable :user_observer do
-      new_user.save
-    end
+    new_user.save
   end
 
   context 'when a new user is created' do
diff --git a/spec/observers/users_project_observer_spec.rb b/spec/observers/users_project_observer_spec.rb
index 548f1893848..9cf629214ab 100644
--- a/spec/observers/users_project_observer_spec.rb
+++ b/spec/observers/users_project_observer_spec.rb
@@ -11,9 +11,7 @@ describe UsersProjectObserver do
   describe "#after_commit" do
     it "should called when UsersProject created" do
       subject.should_receive(:after_commit).once
-      UsersProject.observers.enable :users_project_observer do
-        create(:users_project)
-      end
+      create(:users_project)
     end
 
     it "should send email to user" do
@@ -36,9 +34,7 @@ describe UsersProjectObserver do
   describe "#after_update" do
     it "should called when UsersProject updated" do
       subject.should_receive(:after_commit).once
-      UsersProject.observers.enable :users_project_observer do
-        create(:users_project).update_attribute(:project_access, UsersProject::MASTER)
-      end
+      create(:users_project).update_attribute(:project_access, UsersProject::MASTER)
     end
 
     it "should send email to user" do
@@ -47,19 +43,14 @@ describe UsersProjectObserver do
     end
     it "should not called after UsersProject destroyed" do
       subject.should_not_receive(:after_commit)
-      UsersProject.observers.enable :users_project_observer do
-        users_project.destroy
-      end
+      users_project.destroy
     end
   end
 
   describe "#after_destroy" do
     it "should called when UsersProject destroyed" do
       subject.should_receive(:after_destroy)
-
-      UsersProject.observers.enable :users_project_observer do
-        create(:users_project).destroy
-      end
+      create(:users_project).destroy
     end
 
     it "should create new event" do
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index b44359d27d5..8f4e51f5a44 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -28,7 +28,7 @@ describe Gitlab::API do
 
   describe "GET /projects/:id/issues" do
     it "should return project issues" do
-      get api("/projects/#{project.path}/issues", user)
+      get api("/projects/#{project.id}/issues", user)
       response.status.should == 200
       json_response.should be_an Array
       json_response.first['title'].should == issue.title
@@ -37,7 +37,7 @@ describe Gitlab::API do
 
   describe "GET /projects/:id/issues/:issue_id" do
     it "should return a project issue by id" do
-      get api("/projects/#{project.path}/issues/#{issue.id}", user)
+      get api("/projects/#{project.id}/issues/#{issue.id}", user)
       response.status.should == 200
       json_response['title'].should == issue.title
     end
@@ -45,7 +45,7 @@ describe Gitlab::API do
 
   describe "POST /projects/:id/issues" do
     it "should create a new project issue" do
-      post api("/projects/#{project.path}/issues", user),
+      post api("/projects/#{project.id}/issues", user),
         title: 'new issue', labels: 'label, label2'
       response.status.should == 201
       json_response['title'].should == 'new issue'
@@ -56,7 +56,7 @@ describe Gitlab::API do
 
   describe "PUT /projects/:id/issues/:issue_id" do
     it "should update a project issue" do
-      put api("/projects/#{project.path}/issues/#{issue.id}", user),
+      put api("/projects/#{project.id}/issues/#{issue.id}", user),
         title: 'updated title', labels: 'label2', closed: 1
       response.status.should == 200
       json_response['title'].should == 'updated title'
@@ -67,7 +67,7 @@ describe Gitlab::API do
 
   describe "DELETE /projects/:id/issues/:issue_id" do
     it "should delete a project issue" do
-      delete api("/projects/#{project.path}/issues/#{issue.id}", user)
+      delete api("/projects/#{project.id}/issues/#{issue.id}", user)
       response.status.should == 405
     end
   end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index bbaff53e5a3..f7b067070e0 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -11,14 +11,14 @@ describe Gitlab::API do
   describe "GET /projects/:id/merge_requests" do
     context "when unauthenticated" do
       it "should return authentication error" do
-        get api("/projects/#{project.path}/merge_requests")
+        get api("/projects/#{project.id}/merge_requests")
         response.status.should == 401
       end
     end
 
     context "when authenticated" do
       it "should return an array of merge_requests" do
-        get api("/projects/#{project.path}/merge_requests", user)
+        get api("/projects/#{project.id}/merge_requests", user)
         response.status.should == 200
         json_response.should be_an Array
         json_response.first['title'].should == merge_request.title
@@ -28,7 +28,7 @@ describe Gitlab::API do
 
   describe "GET /projects/:id/merge_request/:merge_request_id" do
     it "should return merge_request" do
-      get api("/projects/#{project.path}/merge_request/#{merge_request.id}", user)
+      get api("/projects/#{project.id}/merge_request/#{merge_request.id}", user)
       response.status.should == 200
       json_response['title'].should == merge_request.title
     end
@@ -36,7 +36,7 @@ describe Gitlab::API do
 
   describe "POST /projects/:id/merge_requests" do
     it "should return merge_request" do
-      post api("/projects/#{project.path}/merge_requests", user),
+      post api("/projects/#{project.id}/merge_requests", user),
         title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user
       response.status.should == 201
       json_response['title'].should == 'Test merge_request'
@@ -45,7 +45,7 @@ describe Gitlab::API do
 
   describe "PUT /projects/:id/merge_request/:merge_request_id" do
     it "should return merge_request" do
-      put api("/projects/#{project.path}/merge_request/#{merge_request.id}", user), title: "New title"
+      put api("/projects/#{project.id}/merge_request/#{merge_request.id}", user), title: "New title"
       response.status.should == 200
       json_response['title'].should == 'New title'
     end
@@ -53,7 +53,7 @@ describe Gitlab::API do
 
   describe "POST /projects/:id/merge_request/:merge_request_id/comments" do
     it "should return comment" do
-      post api("/projects/#{project.path}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
+      post api("/projects/#{project.id}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
       response.status.should == 201
       json_response['note'].should == 'My comment'
     end
diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb
index bf42db62282..f7df90d0fdd 100644
--- a/spec/requests/api/milestones_spec.rb
+++ b/spec/requests/api/milestones_spec.rb
@@ -11,7 +11,7 @@ describe Gitlab::API do
 
   describe "GET /projects/:id/milestones" do
     it "should return project milestones" do
-      get api("/projects/#{project.path}/milestones", user)
+      get api("/projects/#{project.id}/milestones", user)
       response.status.should == 200
       json_response.should be_an Array
       json_response.first['title'].should == milestone.title
@@ -20,7 +20,7 @@ describe Gitlab::API do
 
   describe "GET /projects/:id/milestones/:milestone_id" do
     it "should return a project milestone by id" do
-      get api("/projects/#{project.path}/milestones/#{milestone.id}", user)
+      get api("/projects/#{project.id}/milestones/#{milestone.id}", user)
       response.status.should == 200
       json_response['title'].should == milestone.title
     end
@@ -28,7 +28,7 @@ describe Gitlab::API do
 
   describe "POST /projects/:id/milestones" do
     it "should create a new project milestone" do
-      post api("/projects/#{project.path}/milestones", user),
+      post api("/projects/#{project.id}/milestones", user),
         title: 'new milestone'
       response.status.should == 201
       json_response['title'].should == 'new milestone'
@@ -38,7 +38,7 @@ describe Gitlab::API do
 
   describe "PUT /projects/:id/milestones/:milestone_id" do
     it "should update a project milestone" do
-      put api("/projects/#{project.path}/milestones/#{milestone.id}", user),
+      put api("/projects/#{project.id}/milestones/#{milestone.id}", user),
         title: 'updated title'
       response.status.should == 200
       json_response['title'].should == 'updated title'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d9cc192e7d4..a1331fa79db 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -37,13 +37,10 @@ RSpec.configure do |config|
   config.before do
     stub_gitolite!
 
-    # !!! Observers disabled by default in tests
-    #ActiveRecord::Base.observers.disable(:all)
-    # ActiveRecord::Base.observers.enable(:all)
-
     # Use tmp dir for FS manipulations
-    Gitlab.config.gitolite.stub(repos_path: Rails.root.join('tmp', 'test-git-base-path'))
-    FileUtils.rm_rf Gitlab.config.gitolite.repos_path
-    FileUtils.mkdir_p Gitlab.config.gitolite.repos_path
+    temp_repos_path = Rails.root.join('tmp', 'test-git-base-path')
+    Gitlab.config.gitolite.stub(repos_path: temp_repos_path)
+    FileUtils.rm_rf temp_repos_path
+    FileUtils.mkdir_p temp_repos_path
   end
 end