Commit ce84e3f4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fixed tests. added test for gitlab_ci_service model

parent e65731bb
# == 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
...@@ -33,8 +33,7 @@ describe Issue do ...@@ -33,8 +33,7 @@ describe Issue do
end end
describe 'modules' do describe 'modules' do
it { should include_module(IssueCommonality) } it { should include_module(Issuable) }
it { should include_module(Votes) }
end end
subject { create(:issue) } subject { create(:issue) }
......
...@@ -33,8 +33,7 @@ describe MergeRequest do ...@@ -33,8 +33,7 @@ describe MergeRequest do
end end
describe 'modules' do describe 'modules' do
it { should include_module(IssueCommonality) } it { should include_module(Issuable) }
it { should include_module(Votes) }
end end
describe "#mr_and_commit_notes" do describe "#mr_and_commit_notes" do
......
...@@ -40,6 +40,7 @@ describe Milestone do ...@@ -40,6 +40,7 @@ describe Milestone do
end end
it "should count closed issues" do it "should count closed issues" do
IssueObserver.current_user = issue.author
issue.update_attributes(closed: true) issue.update_attributes(closed: true)
milestone.issues << issue milestone.issues << issue
milestone.percent_complete.should == 100 milestone.percent_complete.should == 100
......
...@@ -162,6 +162,7 @@ describe User do ...@@ -162,6 +162,7 @@ describe User do
describe 'filter' do describe 'filter' do
before do before do
User.delete_all
@user = create :user @user = create :user
@admin = create :user, admin: true @admin = create :user, admin: true
@blocked = create :user, blocked: true @blocked = create :user, blocked: true
...@@ -175,6 +176,7 @@ describe User do ...@@ -175,6 +176,7 @@ describe User do
describe :not_in_project do describe :not_in_project do
before do before do
User.delete_all
@user = create :user @user = create :user
@project = create :project @project = create :project
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment