summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-05-09 06:55:20 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-05-09 06:55:20 +0000
commitca91120e6f98de7eeb01cbf4cc7cb0c12bc3e6c4 (patch)
tree7fd004c03f4c4bae5e40bc4c300fc2da191ec773 /spec/models
parent5b0e96d09a7b6309384ef4c300c56872adba0626 (diff)
parenta57c953e0e6ca03f929fb59f13307405822dfcb9 (diff)
downloadgitlab-ce-ca91120e6f98de7eeb01cbf4cc7cb0c12bc3e6c4.tar.gz
Merge branch 'add-runner-type-to-cluster-app' into 'master'
Set `runner_type` for cluster/application See merge request gitlab-org/gitlab-ce!18832
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/clusters/applications/runner_spec.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/clusters/applications/runner_spec.rb b/spec/models/clusters/applications/runner_spec.rb
index 64d995a73c1..5f2c723d483 100644
--- a/spec/models/clusters/applications/runner_spec.rb
+++ b/spec/models/clusters/applications/runner_spec.rb
@@ -74,9 +74,8 @@ describe Clusters::Applications::Runner do
it 'assigns the new runner to runner' do
subject
- gitlab_runner.reload
- expect(gitlab_runner.runner).not_to be_nil
+ expect(gitlab_runner.reload.runner).to be_project_type
end
end