diff --git a/spec/controllers/clicks_controller_spec.rb b/spec/controllers/clicks_controller_spec.rb
deleted file mode 100644
index 67650b2eb85..00000000000
--- a/spec/controllers/clicks_controller_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-require 'rails_helper'
-
-describe ClicksController do
-
-  context 'create' do
-
-    context 'missing params' do
-
-      it 'raises a 404 without a url' do
-        get :track, params: { post_id: 123 }
-
-        expect(response).to be_not_found
-      end
-
-    end
-
-    context 'correct params' do
-      let(:url) { "http://discourse.org" }
-
-      before do
-        request.headers.merge!('REMOTE_ADDR' => '192.168.0.1')
-      end
-
-      context "with a made up url" do
-        render_views
-
-        it "doesn't redirect" do
-          TopicLinkClick.expects(:create_from).returns(nil)
-
-          get :track, params: { url: 'http://discourse.org', post_id: 123 }
-
-          expect(response).not_to be_redirect
-          expect(response.body).to include(I18n.t("redirect_warning"))
-        end
-      end
-
-      context "with a valid url" do
-        it "redirects" do
-          TopicLinkClick.expects(:create_from).with(has_entries('url' => 'http://discourse.org/?hello=123')).returns(url)
-
-          get :track, params: { url: 'http://discourse.org/?hello=123', post_id: 123 }
-
-          expect(response).to redirect_to(url)
-        end
-      end
-
-      context 'with a post_id' do
-        it 'redirects' do
-          TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1').returns(url)
-
-          get :track, params: { url: url, post_id: 123 }
-
-          expect(response).to redirect_to(url)
-        end
-
-        it "redirects links in whispers to staff members" do
-          log_in(:admin)
-          whisper = Fabricate(:post, post_type: Post.types[:whisper])
-
-          get :track, params: { url: url, post_id: whisper.id }
-
-          expect(response).to redirect_to(url)
-        end
-
-        it "doesn't redirect with the redirect=false param" do
-          TopicLinkClick.expects(:create_from).with('url' => url, 'post_id' => '123', 'ip' => '192.168.0.1', 'redirect' => 'false').returns(url)
-
-          get :track, params: { url: url, post_id: 123, redirect: 'false' }
-
-          expect(response).not_to be_redirect
-        end
-      end
-
-      context 'with a topic_id' do
-        it 'redirects' do
-          TopicLinkClick.expects(:create_from).with('url' => url, 'topic_id' => '789', 'ip' => '192.168.0.1').returns(url)
-
-          get :track, params: { url: url, topic_id: 789 }
-
-          expect(response).to redirect_to(url)
-        end
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/requests/clicks_controller_spec.rb b/spec/requests/clicks_controller_spec.rb
new file mode 100644
index 00000000000..293b07bdf70
--- /dev/null
+++ b/spec/requests/clicks_controller_spec.rb
@@ -0,0 +1,61 @@
+require 'rails_helper'
+
+describe ClicksController do
+  context 'create' do
+    context 'missing params' do
+      it 'raises a 404 without a url' do
+        get "/clicks/track", params: { post_id: 123 }
+        expect(response).to be_not_found
+      end
+    end
+
+    context 'correct params' do
+      let(:url) { "https://discourse.org/" }
+      let(:headers) { { REMOTE_ADDR: "192.168.0.1" } }
+      let(:post) { create_post(raw: "this is a post with a link #{url}") }
+
+      context "with a made up url" do
+        it "doesn't redirect" do
+          get "/clicks/track", params: { url: 'https://fakewebsite.com', post_id: post.id }, headers: headers
+          expect(response).not_to be_redirect
+          expect(response.body).to include(I18n.t("redirect_warning"))
+        end
+      end
+
+      context "with a valid url" do
+        it "redirects" do
+          get "/clicks/track", params: { url: 'https://discourse.org/?hello=123', post_id: post.id }, headers: headers
+          expect(response).to redirect_to("https://discourse.org/?hello=123")
+        end
+      end
+
+      context 'with a post_id' do
+        it 'redirects' do
+          get "/clicks/track", params: { url: url, post_id: post.id }, headers: headers
+          expect(response).to redirect_to(url)
+        end
+
+        it "redirects links in whispers to staff members" do
+          sign_in(Fabricate(:admin))
+          whisper = Fabricate(:post, post_type: Post.types[:whisper])
+
+          get "/clicks/track", params: { url: url, post_id: whisper.id }, headers: headers
+
+          expect(response).to redirect_to(url)
+        end
+
+        it "doesn't redirect with the redirect=false param" do
+          get "/clicks/track", params: { url: url, post_id: post.id, redirect: 'false' }, headers: headers
+          expect(response).not_to be_redirect
+        end
+      end
+
+      context 'with a topic_id' do
+        it 'redirects' do
+          get "/clicks/track", params: { url: url, topic_id: post.topic.id }, headers: headers
+          expect(response).to redirect_to(url)
+        end
+      end
+    end
+  end
+end