Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-11-21 17:28:22 +0300
committerLin Jen-Shin <godfat@godfat.org>2016-11-21 17:28:22 +0300
commit9b1240783b3bf94b0b493d6b501a548f9d8bc8a7 (patch)
treed6b48fded699f9f9c0a02184906a24818761bd26 /spec/models/ci
parent1edb1746a51a19fae24c976c329e80a1dbd6062a (diff)
parente33a9bee68011b7cfc604acd8d87bf4242c45451 (diff)
Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelines
* upstream/master: (302 commits) Fix a wrong "The build for this merge request failed" message Add documentation about todos and failed builds Add Changelog entry for failed builds todos fix Do not create TODO when build is allowed to fail Fix 404 on some group pages when name contains dot Grapify the users API Remove duplicate sidekiq throttling parameters Fix regression in Merge request form Fix wrong link Fix test Fix broken test Changes for stop url to path fix typo in gitlab_flow.md ('munch'->'much') Fix spec Backport some changes done from Time Tracking feature in EE. Use build instead create in BroadcastMessage model spec Try to fix tests Remove unnecessary self from user model Expose stop_path for environment to not construct that in frontend Bring back the `commit_url` as it's used by CycleAnalytics ...
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/build_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index a37a00f461a..a7e90c8a381 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -4,6 +4,12 @@ describe Ci::Build, models: true do
let(:build) { create(:ci_build) }
let(:test_trace) { 'This is a test' }
+ it { is_expected.to belong_to(:runner) }
+ it { is_expected.to belong_to(:trigger_request) }
+ it { is_expected.to belong_to(:erased_by) }
+
+ it { is_expected.to have_many(:deployments) }
+
describe '#trace' do
it 'obfuscates project runners token' do
allow(build).to receive(:raw_trace).and_return("Test: #{build.project.runners_token}")