summaryrefslogtreecommitdiff
path: root/spec/requests/api
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-14 02:13:34 +0000
committerRémy Coutable <remy@rymai.me>2017-03-14 02:13:34 +0000
commitedf29b571f6ca241d1d245eb92cd70df88460bb7 (patch)
tree6d8144c5dee9612a6eec45f225fe9fe703510030 /spec/requests/api
parent2526d2dc449ee440f7b1ce62fbb4f3b217e3a5dc (diff)
parent2e1b2233ce92fadd81ce3e89e1cd1220b9730060 (diff)
downloadgitlab-ce-edf29b571f6ca241d1d245eb92cd70df88460bb7.tar.gz
Merge branch 'fix/regression-in-runners-registration-v1-api' into 'master'
Fix regression in runners registration v1 api See merge request !9904
Diffstat (limited to 'spec/requests/api')
-rw-r--r--spec/requests/api/runner_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 15d458e0795..d50fe80b36a 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -39,6 +39,7 @@ describe API::Runner do
expect(json_response['id']).to eq(runner.id)
expect(json_response['token']).to eq(runner.token)
expect(runner.run_untagged).to be true
+ expect(runner.token).not_to eq(registration_token)
end
context 'when project token is used' do
@@ -49,6 +50,8 @@ describe API::Runner do
expect(response).to have_http_status 201
expect(project.runners.size).to eq(1)
+ expect(Ci::Runner.first.token).not_to eq(registration_token)
+ expect(Ci::Runner.first.token).not_to eq(project.runners_token)
end
end
end