merge request entity

3 files changed, 16 insertions, 35 deletions

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
deleted file mode 100644
index 3e174ca47ab..00000000000
--- a/spec/helpers/application_helper_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe ApplicationHelper do
-  context ".gravatar_icon" do
-    context "over http" do
-      it "returns the correct URL to www.gravatar.com" do
-        expected = "http://www.gravatar.com/avatar/f7daa65b2aa96290bb47c4d68d11fe6a?s=40&d=identicon"
-
-        # Pretend we're running over HTTP
-        helper.stub(:request) do
-          request = double('request')
-          request.stub(:ssl?) { false }
-          request
-        end
-
-        helper.gravatar_icon("admin@local.host").should == expected
-      end
-    end
-
-    context "over https" do
-      it "returns the correct URL to secure.gravatar.com" do
-        expected = "https://secure.gravatar.com/avatar/f7daa65b2aa96290bb47c4d68d11fe6a?s=40&d=identicon"
-
-        # Pretend we're running over HTTPS
-        helper.stub(:request) do
-          request = double('request')
-          request.stub(:ssl?) { true }
-          request
-        end
-
-        helper.gravatar_icon("admin@local.host").should == expected
-      end
-    end
-  end
-end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
new file mode 100644
index 00000000000..cb260fc5fb1
--- /dev/null
+++ b/spec/models/merge_request_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe MergeRequest do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/requests/merge_requests_spec.rb b/spec/requests/merge_requests_spec.rb
new file mode 100644
index 00000000000..1252e8cd00d
--- /dev/null
+++ b/spec/requests/merge_requests_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "MergeRequests" do
+  describe "GET /merge_requests" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get merge_requests_path
+      response.status.should be(200)
+    end
+  end
+end