summaryrefslogtreecommitdiff
path: root/spec/controllers/ci
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-09-15 15:51:03 +0300
committerValery Sizov <vsv2711@gmail.com>2015-09-15 15:51:03 +0300
commite2cbb36ba9751021174fd188d1c29e736f7b5d3d (patch)
tree3515122e7480e80b68c7d527d6cc88529148dfae /spec/controllers/ci
parent16ba41a186d5ff393f7d1e3ac1b94fba485aad12 (diff)
downloadgitlab-ce-e2cbb36ba9751021174fd188d1c29e736f7b5d3d.tar.gz
fix specs. Stage 5
Diffstat (limited to 'spec/controllers/ci')
-rw-r--r--spec/controllers/ci/projects_controller_spec.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/spec/controllers/ci/projects_controller_spec.rb b/spec/controllers/ci/projects_controller_spec.rb
index f710e2a3808..b7eb4eac673 100644
--- a/spec/controllers/ci/projects_controller_spec.rb
+++ b/spec/controllers/ci/projects_controller_spec.rb
@@ -7,26 +7,29 @@ describe Ci::ProjectsController do
describe "POST #build" do
it 'should respond 200 if params is ok' do
- post :build, id: @project.id,
+ post :build, {
+ id: @project.id,
ref: 'master',
before: '2aa371379db71ac89ae20843fcff3b3477cf1a1d',
after: '1c8a9df454ef68c22c2a33cca8232bb50849e5c5',
token: @project.token,
ci_yaml_file: gitlab_ci_yaml,
commits: [ { message: "Message" } ]
-
+ }
expect(response).to be_success
expect(response.code).to eq('201')
end
it 'should respond 400 if push about removed branch' do
- post :build, id: @project.id,
+ post :build, {
+ id: @project.id,
ref: 'master',
before: '2aa371379db71ac89ae20843fcff3b3477cf1a1d',
after: '0000000000000000000000000000000000000000',
token: @project.token,
ci_yaml_file: gitlab_ci_yaml
+ }
expect(response).not_to be_success
expect(response.code).to eq('400')
@@ -49,7 +52,7 @@ describe Ci::ProjectsController do
let(:project_dump) { YAML.load File.read(Rails.root.join('spec/support/gitlab_stubs/raw_project.yml')) }
let(:gitlab_url) { GitlabCi.config.gitlab_server.url }
- let (:user_data) do
+ let(:user_data) do
data = JSON.parse File.read(Rails.root.join('spec/support/gitlab_stubs/user.json'))
data.merge("url" => gitlab_url)
end
@@ -85,7 +88,7 @@ describe Ci::ProjectsController do
describe "GET /gitlab" do
let(:gitlab_url) { GitlabCi.config.gitlab_server.url }
- let (:user_data) do
+ let(:user_data) do
data = JSON.parse File.read(Rails.root.join('spec/support/gitlab_stubs/user.json'))
data.merge("url" => gitlab_url)
end