summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-02 17:17:23 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-03 11:34:36 +0200
commitc6bce7e63c305d07dbc91d032df9c783e0cf0c9f (patch)
tree4486203a362731ea5ff90361243b9ca3a09d575e /spec
parent07af37a243ea0d6b5741754ea116044ee46614b3 (diff)
downloadgitlab-ce-c6bce7e63c305d07dbc91d032df9c783e0cf0c9f.tar.gz
Save Ci::Commit object to persist all created builds
Diffstat (limited to 'spec')
-rw-r--r--spec/models/ci/commit_spec.rb8
-rw-r--r--spec/requests/ci/api/builds_spec.rb5
2 files changed, 11 insertions, 2 deletions
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 0939eb946ac..07b875e4f88 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -55,11 +55,15 @@ describe Ci::Commit, models: true do
let!(:commit) { FactoryGirl.create :ci_commit, project: project, ref: 'master', tag: false }
def create_builds(trigger_request = nil)
- commit.create_builds(nil, trigger_request)
+ if commit.create_builds(nil, trigger_request)
+ commit.save
+ end
end
def create_next_builds
- commit.create_next_builds(commit.builds.order(:id).last)
+ if commit.create_next_builds(commit.builds.order(:id).last)
+ commit.save
+ end
end
it 'creates builds' do
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index e5124ea5ea7..7eff8048667 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -22,6 +22,7 @@ describe Ci::API::API do
it "should start a build" do
commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
commit.create_builds(nil)
+ commit.save
build = commit.builds.first
post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -58,6 +59,7 @@ describe Ci::API::API do
it "returns options" do
commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
commit.create_builds(nil)
+ commit.save
post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -68,6 +70,7 @@ describe Ci::API::API do
it "returns variables" do
commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
commit.create_builds(nil)
+ commit.save
project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -87,6 +90,7 @@ describe Ci::API::API do
trigger_request = FactoryGirl.create(:ci_trigger_request_with_variables, commit: commit, trigger: trigger)
commit.create_builds(nil, trigger_request)
+ commit.save
project.variables << Ci::Variable.new(key: "SECRET_KEY", value: "secret_value")
post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }
@@ -105,6 +109,7 @@ describe Ci::API::API do
it "returns dependent builds" do
commit = FactoryGirl.create(:ci_commit, project: project, ref: 'master')
commit.create_builds(nil, nil)
+ commit.save
commit.builds.where(stage: 'test').each(&:success)
post ci_api("/builds/register"), token: runner.token, info: { platform: :darwin }