Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 0 deletions

diff --git a/spec/requests/runner_setup_controller_spec.rb b/spec/requests/runner_setup_controller_spec.rb
new file mode 100644
index 00000000000..665c896e30d
--- /dev/null
+++ b/spec/requests/runner_setup_controller_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe RunnerSetupController do
+  let(:user) { create(:user) }
+
+  before do
+    sign_in(user)
+  end
+
+  describe 'GET /-/runner_setup/platforms' do
+    it 'renders the platforms' do
+      get runner_setup_platforms_url
+
+      expect(response).to have_gitlab_http_status(:ok)
+      expect(json_response).to have_key("windows")
+      expect(json_response).to have_key("kubernetes")
+    end
+  end
+end