diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index aba4415fcb..f3b24cdbc4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -316,7 +316,6 @@ RSpec/LetSetup:
- 'spec/controllers/api/v1/admin/accounts_controller_spec.rb'
- 'spec/controllers/api/v1/filters_controller_spec.rb'
- 'spec/controllers/api/v1/followed_tags_controller_spec.rb'
- - 'spec/controllers/api/v1/tags_controller_spec.rb'
- 'spec/controllers/api/v2/admin/accounts_controller_spec.rb'
- 'spec/controllers/api/v2/filters/keywords_controller_spec.rb'
- 'spec/controllers/api/v2/filters/statuses_controller_spec.rb'
@@ -756,7 +755,6 @@ Rails/WhereExists:
- 'app/workers/move_worker.rb'
- 'db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb'
- 'lib/tasks/tests.rake'
- - 'spec/controllers/api/v1/tags_controller_spec.rb'
- 'spec/models/account_spec.rb'
- 'spec/services/activitypub/process_collection_service_spec.rb'
- 'spec/services/purge_domain_service_spec.rb'
diff --git a/spec/controllers/api/v1/tags_controller_spec.rb b/spec/controllers/api/v1/tags_controller_spec.rb
deleted file mode 100644
index e914f5992d..0000000000
--- a/spec/controllers/api/v1/tags_controller_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::V1::TagsController do
- render_views
-
- let(:user) { Fabricate(:user) }
- let(:scopes) { 'write:follows' }
- let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-
- before { allow(controller).to receive(:doorkeeper_token) { token } }
-
- describe 'GET #show' do
- before do
- get :show, params: { id: name }
- end
-
- context 'with existing tag' do
- let!(:tag) { Fabricate(:tag) }
- let(:name) { tag.name }
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
- end
-
- context 'with non-existing tag' do
- let(:name) { 'hoge' }
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
- end
- end
-
- describe 'POST #follow' do
- let!(:unrelated_tag) { Fabricate(:tag) }
-
- before do
- TagFollow.create!(account: user.account, tag: unrelated_tag)
-
- post :follow, params: { id: name }
- end
-
- context 'with existing tag' do
- let!(:tag) { Fabricate(:tag) }
- let(:name) { tag.name }
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
-
- it 'creates follow' do
- expect(TagFollow.where(tag: tag, account: user.account).exists?).to be true
- end
- end
-
- context 'with non-existing tag' do
- let(:name) { 'hoge' }
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
-
- it 'creates follow' do
- expect(TagFollow.where(tag: Tag.find_by!(name: name), account: user.account).exists?).to be true
- end
- end
- end
-
- describe 'POST #unfollow' do
- let!(:tag) { Fabricate(:tag, name: 'foo') }
- let!(:tag_follow) { Fabricate(:tag_follow, account: user.account, tag: tag) }
-
- before do
- post :unfollow, params: { id: tag.name }
- end
-
- it 'returns http success' do
- expect(response).to have_http_status(:success)
- end
-
- it 'removes the follow' do
- expect(TagFollow.where(tag: tag, account: user.account).exists?).to be false
- end
- end
-end
diff --git a/spec/requests/api/v1/tags_spec.rb b/spec/requests/api/v1/tags_spec.rb
new file mode 100644
index 0000000000..300ddf805c
--- /dev/null
+++ b/spec/requests/api/v1/tags_spec.rb
@@ -0,0 +1,169 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Tags' do
+ let(:user) { Fabricate(:user) }
+ let(:scopes) { 'write:follows' }
+ let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+ let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+ describe 'GET /api/v1/tags/:id' do
+ subject do
+ get "/api/v1/tags/#{name}"
+ end
+
+ context 'when the tag exists' do
+ let!(:tag) { Fabricate(:tag) }
+ let(:name) { tag.name }
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+
+ it 'returns the tag' do
+ subject
+
+ expect(body_as_json[:name]).to eq(name)
+ end
+ end
+
+ context 'when the tag does not exist' do
+ let(:name) { 'hoge' }
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+ end
+
+ context 'when the tag name is invalid' do
+ let(:name) { 'tag-name' }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+ end
+
+ describe 'POST /api/v1/tags/:id/follow' do
+ subject do
+ post "/api/v1/tags/#{name}/follow", headers: headers
+ end
+
+ let!(:tag) { Fabricate(:tag) }
+ let(:name) { tag.name }
+
+ it_behaves_like 'forbidden for wrong scope', 'read read:follows'
+
+ context 'when the tag exists' do
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'creates follow' do
+ subject
+
+ expect(TagFollow.where(tag: tag, account: user.account)).to exist
+ end
+ end
+
+ context 'when the tag does not exist' do
+ let(:name) { 'hoge' }
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+
+ it 'creates a new tag with the specified name' do
+ subject
+
+ expect(Tag.where(name: name)).to exist
+ end
+
+ it 'creates follow' do
+ subject
+
+ expect(TagFollow.where(tag: Tag.find_by(name: name), account: user.account)).to exist
+ end
+ end
+
+ context 'when the tag name is invalid' do
+ let(:name) { 'tag-name' }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context 'when the Authorization header is missing' do
+ let(:headers) { {} }
+ let(:name) { 'unauthorized' }
+
+ it 'returns http unauthorized' do
+ subject
+
+ expect(response).to have_http_status(401)
+ end
+ end
+ end
+
+ describe 'POST #unfollow' do
+ subject do
+ post "/api/v1/tags/#{name}/unfollow", headers: headers
+ end
+
+ let(:name) { tag.name }
+ let!(:tag) { Fabricate(:tag, name: 'foo') }
+
+ before do
+ Fabricate(:tag_follow, account: user.account, tag: tag)
+ end
+
+ it_behaves_like 'forbidden for wrong scope', 'read read:follows'
+
+ it 'returns http success' do
+ subject
+
+ expect(response).to have_http_status(200)
+ end
+
+ it 'removes the follow' do
+ subject
+
+ expect(TagFollow.where(tag: tag, account: user.account)).to_not exist
+ end
+
+ context 'when the tag name is invalid' do
+ let(:name) { 'tag-name' }
+
+ it 'returns http not found' do
+ subject
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context 'when the Authorization header is missing' do
+ let(:headers) { {} }
+ let(:name) { 'unauthorized' }
+
+ it 'returns http unauthorized' do
+ subject
+
+ expect(response).to have_http_status(401)
+ end
+ end
+ end
+end