diff --git a/spec/controllers/export_csv_controller_spec.rb b/spec/controllers/export_csv_controller_spec.rb
deleted file mode 100644
index d79c06875a2..00000000000
--- a/spec/controllers/export_csv_controller_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require "rails_helper"
-
-describe ExportCsvController do
-  let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" }
-
-  context "while logged in as normal user" do
-    before { @user = log_in(:user) }
-
-    describe ".export_entity" do
-      it "enqueues export job" do
-        Jobs.expects(:enqueue).with(:export_csv_file, has_entries(entity: "user_archive", user_id: @user.id))
-        post :export_entity, params: { entity: "user_archive" }, format: :json
-        expect(response).to be_successful
-      end
-
-      it "should not enqueue export job if rate limit is reached" do
-        Jobs::ExportCsvFile.any_instance.expects(:execute).never
-        UserExport.create(file_name: "user-archive-codinghorror-150116-003249", user_id: @user.id)
-        post :export_entity, params: { entity: "user_archive" }, format: :json
-        expect(response).not_to be_successful
-      end
-
-      it "returns 404 when normal user tries to export admin entity" do
-        post :export_entity, params: { entity: "staff_action" }, format: :json
-        expect(response).not_to be_successful
-      end
-    end
-  end
-
-  context "while logged in as an admin" do
-    before { @admin = log_in(:admin) }
-
-    describe ".export_entity" do
-      it "enqueues export job" do
-        Jobs.expects(:enqueue).with(:export_csv_file, has_entries(entity: "staff_action", user_id: @admin.id))
-        post :export_entity, params: { entity: "staff_action" }, format: :json
-        expect(response).to be_successful
-      end
-
-      it "should not rate limit export for staff" do
-        Jobs.expects(:enqueue).with(:export_csv_file, has_entries(entity: "staff_action", user_id: @admin.id))
-        UserExport.create(file_name: "screened-email-150116-010145", user_id: @admin.id)
-        post :export_entity, params: { entity: "staff_action" }, format: :json
-        expect(response).to be_successful
-      end
-    end
-  end
-end
diff --git a/spec/requests/export_csv_controller_spec.rb b/spec/requests/export_csv_controller_spec.rb
new file mode 100644
index 00000000000..cc84bd0403a
--- /dev/null
+++ b/spec/requests/export_csv_controller_spec.rb
@@ -0,0 +1,63 @@
+require "rails_helper"
+
+describe ExportCsvController do
+  let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" }
+
+  context "while logged in as normal user" do
+    let(:user) { Fabricate(:user) }
+    before { sign_in(user) }
+
+    describe ".export_entity" do
+      it "enqueues export job" do
+        post "/export_csv/export_entity.json", params: { entity: "user_archive" }
+        expect(response).to be_success
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
+
+        job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+        expect(job_data["entity"]).to eq("user_archive")
+        expect(job_data["user_id"]).to eq(user.id)
+      end
+
+      it "should not enqueue export job if rate limit is reached" do
+        UserExport.create(file_name: "user-archive-codinghorror-150116-003249", user_id: user.id)
+        post "/export_csv/export_entity.json", params: { entity: "user_archive" }
+        expect(response).to be_forbidden
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(0)
+      end
+
+      it "returns 404 when normal user tries to export admin entity" do
+        post "/export_csv/export_entity.json", params: { entity: "staff_action" }
+        expect(response).to be_forbidden
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(0)
+      end
+    end
+  end
+
+  context "while logged in as an admin" do
+    let(:admin) { Fabricate(:admin) }
+    before { sign_in(admin) }
+
+    describe ".export_entity" do
+      it "enqueues export job" do
+        post "/export_csv/export_entity.json", params: { entity: "staff_action" }
+        expect(response).to be_success
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
+
+        job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+        expect(job_data["entity"]).to eq("staff_action")
+        expect(job_data["user_id"]).to eq(admin.id)
+      end
+
+      it "should not rate limit export for staff" do
+        UserExport.create(file_name: "screened-email-150116-010145", user_id: admin.id)
+        post "/export_csv/export_entity.json", params: { entity: "staff_action" }
+        expect(response).to be_success
+        expect(Jobs::ExportCsvFile.jobs.size).to eq(1)
+
+        job_data = Jobs::ExportCsvFile.jobs.first["args"].first
+        expect(job_data["entity"]).to eq("staff_action")
+        expect(job_data["user_id"]).to eq(admin.id)
+      end
+    end
+  end
+end