kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fix part of specs

Browse source
This commit is contained in:
Valery Sizov 2015-09-14 16:48:33 +03:00
parent 4c53cc0eba
commit 2c4daf1a68
3 changed files with 105 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/requests/ci/builds_spec.rb
View file

@ -9,7 +9,7 @@ describe "Builds" do
describe "GET /:project/builds/:id/status.json" do
before do
get status_project_build_path(@project, @build), format: :json
get status_ci_project_build_path(@project, @build), format: :json
end
it { expect(response.status).to eq(200) }

2
spec/requests/ci/commits_spec.rb
View file

@ -8,7 +8,7 @@ describe "Commits" do
describe "GET /:project/refs/:ref_name/commits/:id/status.json" do
before do
get status_project_ref_commit_path(@project, @commit.ref, @commit.sha), format: :json
get status_ci_project_ref_commits_path(@project, @commit.ref, @commit.sha), format: :json
end
it { expect(response.status).to eq(200) }

38
spec/services/ci/create_commit_service_spec.rb
View file

@ -1,8 +1,9 @@
require 'spec_helper'
describe Ci::CreateCommitService do
module Ci
describe CreateCommitService do
let(:service) { CreateCommitService.new }
let(:project) { FactoryGirl.create(:project) }
let(:project) { FactoryGirl.create(:ci_project) }
describe :execute do
context 'valid params' do
@ -16,11 +17,11 @@ describe Ci::CreateCommitService do
)
end
it { commit.should be_kind_of(Commit) }
it { commit.should be_valid }
it { commit.should be_persisted }
it { commit.should == project.commits.last }
it { commit.builds.first.should be_kind_of(Build) }
it { expect(commit).to be_kind_of(Commit) }
it { expect(commit).to be_valid }
it { expect(commit).to be_persisted }
it { expect(commit).to eq(project.commits.last) }
it { expect(commit.builds.first).to be_kind_of(Build) }
end
context "skip tag if there is no build for it" do
@ -32,7 +33,7 @@ describe Ci::CreateCommitService do
ci_yaml_file: gitlab_ci_yaml,
commits: [ { message: "Message" } ]
)
result.should be_persisted
expect(result).to be_persisted
end
it "creates commit if there is no appropriate job but deploy job has right ref setting" do
@ -45,7 +46,7 @@ describe Ci::CreateCommitService do
ci_yaml_file: config,
commits: [ { message: "Message" } ]
)
result.should be_persisted
expect(result).to be_persisted
end
end
@ -59,8 +60,8 @@ describe Ci::CreateCommitService do
commits: commits,
ci_yaml_file: gitlab_ci_yaml
)
commit.builds.any?.should be_false
commit.status.should == "skipped"
expect(commit.builds.any?).to be false
expect(commit.status).to eq("skipped")
end
it "does not skips builds creation if there is no [ci skip] tag in commit message" do
@ -74,7 +75,7 @@ describe Ci::CreateCommitService do
ci_yaml_file: gitlab_ci_yaml
)
commit.builds.first.name.should == "staging"
expect(commit.builds.first.name).to eq("staging")
end
it "skips builds creation if there is [ci skip] tag in commit message and yaml is invalid" do
@ -86,8 +87,8 @@ describe Ci::CreateCommitService do
commits: commits,
ci_yaml_file: "invalid: file"
)
commit.builds.any?.should be_false
commit.status.should == "skipped"
expect(commit.builds.any?).to be false
expect(commit.status).to eq("skipped")
end
end
@ -100,7 +101,7 @@ describe Ci::CreateCommitService do
commits: commits,
ci_yaml_file: gitlab_ci_yaml
)
commit.builds.count(:all).should == 2
expect(commit.builds.count(:all)).to eq(2)
commit = service.execute(project,
ref: 'refs/heads/master',
@ -109,7 +110,7 @@ describe Ci::CreateCommitService do
commits: commits,
ci_yaml_file: gitlab_ci_yaml
)
commit.builds.count(:all).should == 2
expect(commit.builds.count(:all)).to eq(2)
end
it "creates commit with failed status if yaml is invalid" do
@ -123,8 +124,9 @@ describe Ci::CreateCommitService do
ci_yaml_file: "invalid: file"
)
commit.status.should == "failed"
commit.builds.any?.should be_false
expect(commit.status).to eq("failed")
expect(commit.builds.any?).to be false
end
end
end
end