Fixed tests. added test for gitlab_ci_service model

5 files changed, 51 insertions, 4 deletions

diff --git a/spec/models/gitlab_ci_service_spec.rb b/spec/models/gitlab_ci_service_spec.rb
new file mode 100644
index 00000000000..566dbd253c2
--- /dev/null
+++ b/spec/models/gitlab_ci_service_spec.rb
@@ -0,0 +1,46 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  id          :integer          not null, primary key
+#  type        :string(255)
+#  title       :string(255)
+#  token       :string(255)
+#  project_id  :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  active      :boolean          default(FALSE), not null
+#  project_url :string(255)
+#
+
+require 'spec_helper'
+
+describe GitlabCiService do
+  describe "Associations" do
+    it { should belong_to :project }
+    it { should have_one :service_hook }
+  end
+
+  describe "Mass assignment" do
+    it { should_not allow_mass_assignment_of(:project_id) }
+  end
+
+  describe 'commits methods' do
+    before do
+      @service = GitlabCiService.new
+      @service.stub(
+        service_hook: true,
+        project_url: 'http://ci.gitlab.org/projects/2',
+        token: 'verySecret'
+      )
+    end
+
+    describe :commit_badge_path do
+      it { @service.commit_badge_path("2ab7834c").should == "http://ci.gitlab.org/projects/2/status?sha=2ab7834c"}
+    end
+
+    describe :commit_status_path do
+      it { @service.commit_status_path("2ab7834c").should == "http://ci.gitlab.org/projects/2/builds/2ab7834c/status.json?token=verySecret"}
+    end
+  end
+end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 4c52a094386..b4fb9cd8fdd 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -33,8 +33,7 @@ describe Issue do
   end
 
   describe 'modules' do
-    it { should include_module(IssueCommonality) }
-    it { should include_module(Votes) }
+    it { should include_module(Issuable) }
   end
 
   subject { create(:issue) }
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index a0849401254..5642ba7e29a 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -33,8 +33,7 @@ describe MergeRequest do
   end
 
   describe 'modules' do
-    it { should include_module(IssueCommonality) }
-    it { should include_module(Votes) }
+    it { should include_module(Issuable) }
   end
 
   describe "#mr_and_commit_notes" do
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 431985d0d46..f661814787e 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -40,6 +40,7 @@ describe Milestone do
     end
 
     it "should count closed issues" do
+      IssueObserver.current_user = issue.author
       issue.update_attributes(closed: true)
       milestone.issues << issue
       milestone.percent_complete.should == 100
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 51774e4c74d..f19c40b5fa6 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -162,6 +162,7 @@ describe User do
 
   describe 'filter' do
     before do
+      User.delete_all
       @user = create :user
       @admin = create :user, admin: true
       @blocked = create :user, blocked: true
@@ -175,6 +176,7 @@ describe User do
 
   describe :not_in_project do
     before do
+      User.delete_all
       @user = create :user
       @project = create :project
     end