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:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-10-12 22:35:52 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2015-10-12 23:32:29 +0300
commitdaca1c6511c3a09d5f0c33a8c4d29487e668afc2 (patch)
tree09ed2762efbf1bf1268673d474649442285b91e2 /spec/models/ci
parentc61dc1315077ad4e175a3c76991872c0e7b1d2ab (diff)
Fix broken tests
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/commit_spec.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index 371add4ee59..330971174fb 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -125,7 +125,7 @@ describe Ci::Commit do
end
it 'returns all refs' do
- is_expected.to contain_exactly('master', 'develop')
+ is_expected.to contain_exactly('master', 'develop', nil)
end
end
@@ -225,9 +225,10 @@ describe Ci::Commit do
it 'rebuilds commit' do
expect(commit.status).to eq('skipped')
expect(create_builds(trigger_request)).to be_truthy
- commit.builds.reload
- expect(commit.builds.size).to eq(2)
- expect(commit.status).to eq('pending')
+
+ # since everything in Ci::Commit is cached we need to fetch a new object
+ new_commit = Ci::Commit.find_by_id(commit.id)
+ expect(new_commit.status).to eq('pending')
end
end
end