Changeset 1098

Timestamp:

12/13/07 22:56:41 (1 year ago)

Author:

e.@brainspl.at

Message:

add redirect matcher to rspec test helpers. closes #291 [yerejm@gmail.com]

Files:

• trunk/lib/merb/test/rspec.rb (modified) (1 diff)
• trunk/spec/merb/controller_spec.rb (modified) (1 diff)
• trunk/spec/spec_helper.rb (modified) (1 diff)

trunk/lib/merb/test/rspec.rb

@@ -3 +3 @@
-module Merb
-  module Test
+    module MerbRspecControllerRedirect
+      class BeRedirect
+        def matches?(target)
+          @target = target
+          target == 302
+        end
+        def failure_message
+          "expected to redirect"
+        end
+        def negative_failure_message
+          "expected not to redirect"
+        end
+      end
+
+      class Redirect
+        def matches?(target)
+          @target = target
+          BeRedirect.new.matches?(target.status)
+        end
+        def failure_message
+          "expected #{@target.inspect} to redirect"
+        end
+        def negative_failure_message
+          "expected #{@target.inspect} not to redirect"
+        end
+      end
+
+      class RedirectTo
+        def initialize(expected)
+          @expected = expected
+        end
+
+        def matches?(target)
+          @target = target.headers['Location']
+          @redirected = BeRedirect.new.matches?(target.status)
+          @target == @expected
+        end
+
+        def failure_message
+          msg = "expected a redirect to <#{@expected}>, but "
+          if @redirected
+            msg << "found one to <#{@target}>" 
+          else
+            msg << "there was no redirect"
+          end
+        end
+
+        def negative_failure_message
+          "expected not to redirect to <#{@expected}>, but did anyway"
+        end
+      end
+
+      def be_redirect
+        BeRedirect.new
+      end
+
+      def redirect
+        Redirect.new
+      end
+
+      def redirect_to(expected)
+        RedirectTo.new(expected)
+      end
+    end
+      
-    module RspecMatchers
-      class HaveSelector

trunk/spec/merb/controller_spec.rb

@@ -146 +146 @@
-  # end
-end
+
+describe "Controller", "redirect spec helpers" do
+  class Redirector < Merb::Controller
+    def index
+      redirect("/foo")
+    end
+    def show
+    end
+  end
+  
+  before(:each) do
+    @controller = Redirector.build(fake_request)
+  end
+  
+  it "should be able to match redirects" do
+    @controller.dispatch('index')
+    @controller.status.should be_redirect
+    @controller.should redirect
+    @controller.should redirect_to("/foo")
+  end
+  
+  it "should be able to negative match redirects" do
+    @controller.dispatch('show')
+    @controller.status.should_not be_redirect
+    @controller.should_not redirect
+    @controller.should_not redirect_to("/foo")
+  end
+end

trunk/spec/spec_helper.rb

@@ -19 +19 @@
-  config.include(Merb::Test::Helper)
-  config.include(Merb::Test::RspecMatchers)
+  config.include(Merb::Test::MerbRspecControllerRedirect)  
-end
-