diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-04 00:20:54 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-04 00:20:54 +0800 |
commit | 985c68a1ec34eedfe3d6e5b8ca2020af9f9c3457 (patch) | |
tree | 1bce2852231527b7d0d7e113202540e3a25a1a1d /spec/models/ci/runner_spec.rb | |
parent | 7a4d723e6ba287fe792dca0a8ddc3d8a77b1876c (diff) | |
parent | 98e6e3062d4a69b4ed22dcffbb869b26d28fd573 (diff) | |
download | gitlab-ce-985c68a1ec34eedfe3d6e5b8ca2020af9f9c3457.tar.gz |
Merge remote-tracking branch 'upstream/master' into use-update-runner-service
* upstream/master: (589 commits)
Backport changes from EE squash
Fix broken tests Rename Build to Job
Adds changelog entry
Change "Build" to "Job" in builds show page header and sidebar
replace `find_with_namespace` with `find_by_full_path`
PlantUML support for Markdown
remove dateFormat global exception
fix relative paths to xterm.js within fit.js
use setFixtures instead of fixture.set
prevent u2f tests from triggering a form submission while testing
simplify test for focus state
preload projects.json fixture
preload projects.json fixture
rework tests which rely on teaspoon-specific behavior
Only render hr when user can't archive project.
use setFixtures instead of fixture.set
ensure helper classes and constants are exposed globally
preload projects.json fixture
fix fixture references in environments_spec
allow console.xxx in tests, reorder eslint rules alphabetically
...
Diffstat (limited to 'spec/models/ci/runner_spec.rb')
-rw-r--r-- | spec/models/ci/runner_spec.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb index 6283673d7ae..f8513ac8b1c 100644 --- a/spec/models/ci/runner_spec.rb +++ b/spec/models/ci/runner_spec.rb @@ -91,8 +91,7 @@ describe Ci::Runner, models: true do end describe '#can_pick?' do - let(:project) { create(:project) } - let(:pipeline) { create(:ci_pipeline, project: project) } + let(:pipeline) { create(:ci_pipeline) } let(:build) { create(:ci_build, pipeline: pipeline) } let(:runner) { create(:ci_runner) } @@ -340,8 +339,8 @@ describe Ci::Runner, models: true do describe '.assignable_for' do let(:runner) { create(:ci_runner) } - let(:project) { create(:project) } - let(:another_project) { create(:project) } + let(:project) { create(:empty_project) } + let(:another_project) { create(:empty_project) } before do project.runners << runner |