Commit e02a5c4c authored by Tetiana Chupryna's avatar Tetiana Chupryna

Merge branch 'fix-api-runner-status-exposure' into 'master'

Fix expose status in Runners API

See merge request gitlab-org/gitlab!76761
parents ed5fbfb7 6b007a60
...@@ -14,7 +14,7 @@ module API ...@@ -14,7 +14,7 @@ module API
expose :online?, as: :online expose :online?, as: :online
# DEPRECATED # DEPRECATED
# TODO Remove in %15.0 in favor of `status` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/344648 # TODO Remove in %15.0 in favor of `status` for REST calls, see https://gitlab.com/gitlab-org/gitlab/-/issues/344648
expose :status, as: :deprecated_rest_status expose :deprecated_rest_status, as: :status
end end
end end
end end
......
...@@ -254,6 +254,7 @@ RSpec.describe API::Ci::Runners do ...@@ -254,6 +254,7 @@ RSpec.describe API::Ci::Runners do
expect(response).to have_gitlab_http_status(:ok) expect(response).to have_gitlab_http_status(:ok)
expect(json_response['description']).to eq(shared_runner.description) expect(json_response['description']).to eq(shared_runner.description)
expect(json_response['maximum_timeout']).to be_nil expect(json_response['maximum_timeout']).to be_nil
expect(json_response['status']).to eq("not_connected")
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment