1 files changed, 0 insertions, 81 deletions
diff --git a/spec/controllers/merge_requests_controller_spec.rb b/spec/controllers/merge_requests_controller_spec.rb
deleted file mode 100644
index d6f56ed33d6..00000000000
--- a/spec/controllers/merge_requests_controller_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe Projects::MergeRequestsController do
-  let(:project) { create(:project) }
-  let(:user)    { create(:user) }
-  let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
-
-  before do
-    sign_in(user)
-    project.team << [user, :master]
-  end
-
-  describe "#show" do
-    shared_examples "export merge as" do |format|
-      it "should generally work" do
-        get(:show, namespace_id: project.namespace.to_param,
-            project_id: project.to_param, id: merge_request.iid, format: format)
-
-        expect(response).to be_success
-      end
-
-      it "should generate it" do
-        expect_any_instance_of(MergeRequest).to receive(:"to_#{format}")
-
-        get(:show, namespace_id: project.namespace.to_param,
-            project_id: project.to_param, id: merge_request.iid, format: format)
-      end
-
-      it "should render it" do
-        get(:show, namespace_id: project.namespace.to_param,
-            project_id: project.to_param, id: merge_request.iid, format: format)
-
-        expect(response.body).to eq((merge_request.send(:"to_#{format}",user)).to_s)
-      end
-
-      it "should not escape Html" do
-        allow_any_instance_of(MergeRequest).to receive(:"to_#{format}").
-          and_return('HTML entities &<>" ')
-
-        get(:show, namespace_id: project.namespace.to_param,
-            project_id: project.to_param, id: merge_request.iid, format: format)
-
-        expect(response.body).to_not include('&amp;')
-        expect(response.body).to_not include('&gt;')
-        expect(response.body).to_not include('&lt;')
-        expect(response.body).to_not include('&quot;')
-      end
-    end
-
-    describe "as diff" do
-      include_examples "export merge as", :diff
-      let(:format) { :diff }
-
-      it "should really only be a git diff" do
-        get(:show, namespace_id: project.namespace.to_param,
-            project_id: project.to_param, id: merge_request.iid, format: format)
-
-        expect(response.body).to start_with("diff --git")
-      end
-    end
-
-    describe "as patch" do
-      include_examples "export merge as", :patch
-      let(:format) { :patch }
-
-      it "should really be a git email patch with commit" do
-        get(:show, namespace_id: project.namespace.to_param,
-            project_id: project.to_param, id: merge_request.iid, format: format)
-
-        expect(response.body[0..100]).to start_with("From #{merge_request.commits.last.id}")
-      end
-
-      it "should contain git diffs" do
-        get(:show, namespace_id: project.namespace.to_param,
-            project_id: project.to_param, id: merge_request.iid, format: format)
-
-        expect(response.body).to match(/^diff --git/)
-      end
-    end
-  end
-end