From ef5bb32f95e10ce5ba3bf991d2315e352b1c5dc5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 19 Dec 2020 21:10:05 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 ...efactor-users_controller_spec-gpg_keys.yml |  5 +++
 spec/controllers/users_controller_spec.rb     | 34 +++++--------------
 2 files changed, 13 insertions(+), 26 deletions(-)
 create mode 100644 changelogs/unreleased/293967-refactor-users_controller_spec-gpg_keys.yml

diff --git a/changelogs/unreleased/293967-refactor-users_controller_spec-gpg_keys.yml b/changelogs/unreleased/293967-refactor-users_controller_spec-gpg_keys.yml
new file mode 100644
index 00000000000..856817005fb
--- /dev/null
+++ b/changelogs/unreleased/293967-refactor-users_controller_spec-gpg_keys.yml
@@ -0,0 +1,5 @@
+---
+title: Refactor specs around gpg_keys in users_controller_spec.rb
+merge_request: 50337
+author: Takuya Noguchi
+type: other
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 916befe3f62..8809d859f7f 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -337,22 +337,12 @@ RSpec.describe UsersController do
     end
 
     describe "user with no keys" do
-      it "does generally work" do
+      it "responds the empty body with text/plain content type" do
         get :gpg_keys, params: { username: user.username }
 
         expect(response).to be_successful
-      end
-
-      it "renders all keys separated with a new line" do
-        get :gpg_keys, params: { username: user.username }
-
-        expect(response.body).to eq("")
-      end
-
-      it "responds with text/plain content type" do
-        get :gpg_keys, params: { username: user.username }
-
         expect(response.content_type).to eq("text/plain")
+        expect(response.body).to eq("")
       end
     end
 
@@ -371,21 +361,17 @@ RSpec.describe UsersController do
           expect(response).to be_successful
         end
 
-        it "renders all verified keys separated with a new line" do
+        it "renders all verified keys separated with a new line with text/plain content type" do
           get :gpg_keys, params: { username: user.username }
 
+          expect(response.content_type).to eq("text/plain")
+
           expect(response.body).not_to eq('')
           expect(response.body).to eq(user.gpg_keys.select(&:verified?).map(&:key).join("\n"))
 
           expect(response.body).to include(gpg_key.key)
           expect(response.body).to include(another_gpg_key.key)
         end
-
-        it "responds with text/plain content type" do
-          get :gpg_keys, params: { username: user.username }
-
-          expect(response.content_type).to eq("text/plain")
-        end
       end
 
       describe 'when logged out' do
@@ -399,21 +385,17 @@ RSpec.describe UsersController do
           expect(response).to be_successful
         end
 
-        it "renders all verified keys separated with a new line" do
+        it "renders all verified keys separated with a new line with text/plain content type" do
           get :gpg_keys, params: { username: user.username }
 
+          expect(response.content_type).to eq("text/plain")
+
           expect(response.body).not_to eq('')
           expect(response.body).to eq(user.gpg_keys.map(&:key).join("\n"))
 
           expect(response.body).to include(gpg_key.key)
           expect(response.body).to include(another_gpg_key.key)
         end
-
-        it "responds with text/plain content type" do
-          get :gpg_keys, params: { username: user.username }
-
-          expect(response.content_type).to eq("text/plain")
-        end
       end
 
       describe 'when revoked' do