remarkable_rails 3.1.8 → 3.1.9

data/spec/action_controller/respond_with_matcher_spec.rb

@@ -1,230 +1,230 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe 'respond_with' do
-  include FunctionalBuilder
-
-  describe 'messages' do
-    before(:each) do
-      build_response
-      @matcher = respond_with(:error)
-    end
-
-    it 'should contain a description message' do
-      respond_with(404).description.should == 'respond with 404'
-      respond_with(:error).description.should == 'respond with error'
-      respond_with(500..599).description.should == 'respond with 500..599'
-
-      @matcher.body(/anything/)
-      @matcher.description.should == 'respond with error and with body /anything/'
-
-      @matcher.content_type(Mime::XML).matches?(@controller)
-      @matcher.description.should == 'respond with error, with body /anything/, and with content type "application/xml"'
-    end
-
-    it 'should set status_matches? message' do
-      @matcher.matches?(@controller)
-      @matcher.failure_message.should == 'Expected to respond with status :error, got 200'
-    end
-
-    it 'should set content_type_matches? message' do
-      @matcher = respond_with(:success)
-      @matcher.body(/anything/).matches?(@controller)
-      @matcher.failure_message.should == 'Expected to respond with body /anything/, got " "'
-    end
-
-    it 'should set content_type_matches? message' do
-      @matcher = respond_with(:success)
-      @matcher.content_type(Mime::XML).matches?(@controller)
-      @matcher.failure_message.should == 'Expected to respond with content type "application/xml", got "text/html"'
-    end
-  end
-
-  describe 'matcher' do
-
-    describe 'on success' do
-      before(:each){ build_response }
-
-      it { should respond_with(200) }
-      it { should respond_with(:ok) }
-      it { should respond_with(:success) }
-      it { should respond_with(200..299) }
-
-      it { should respond_with(200, :content_type => Mime::HTML) }
-      it { should respond_with(:ok, :content_type => Mime::HTML) }
-      it { should respond_with(:success, :content_type => Mime::HTML) }
-      it { should respond_with(200..299, :content_type => Mime::HTML) }
-
-      it { should_not respond_with(404) }
-      it { should_not respond_with(:not_found) }
-      it { should_not respond_with(300..400) }
-    end
-
-    describe 'on missing' do
-      before(:each){ build_response { render :text => "404 Not Found", :status => 404 } }
-
-      it { should respond_with(404) }
-      it { should respond_with(:not_found) }
-      it { should respond_with(:missing) }
-      it { should respond_with(400..405) }
-
-      it { should_not respond_with(302) }
-      it { should_not respond_with(:found) }
-      it { should_not respond_with(:redirect) }
-      it { should_not respond_with(300..305) }
-    end
-
-    describe 'respond_with_body' do
-      before(:each) { build_response { respond_to{ |format| format.xml { render :xml => [].to_xml } } } }
-
-      it { should respond_with_body(%{<?xml version="1.0" encoding="UTF-8"?>\n<nil-classes type="array"/>\n}) }
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe 'respond_with' do
+  include FunctionalBuilder
+
+  describe 'messages' do
+    before(:each) do
+      build_response
+      @matcher = respond_with(:error)
+    end
+
+    it 'should contain a description message' do
+      respond_with(404).description.should == 'respond with 404'
+      respond_with(:error).description.should == 'respond with error'
+      respond_with(500..599).description.should == 'respond with 500..599'
+
+      @matcher.body(/anything/)
+      @matcher.description.should == 'respond with error and with body /anything/'
+
+      @matcher.content_type(Mime::XML).matches?(@controller)
+      @matcher.description.should == 'respond with error, with body /anything/, and with content type "application/xml"'
+    end
+
+    it 'should set status_matches? message' do
+      @matcher.matches?(@controller)
+      @matcher.failure_message.should == 'Expected to respond with status :error, got 200'
+    end
+
+    it 'should set content_type_matches? message' do
+      @matcher = respond_with(:success)
+      @matcher.body(/anything/).matches?(@controller)
+      @matcher.failure_message.should == 'Expected to respond with body /anything/, got " "'
+    end
+
+    it 'should set content_type_matches? message' do
+      @matcher = respond_with(:success)
+      @matcher.content_type(Mime::XML).matches?(@controller)
+      @matcher.failure_message.should == 'Expected to respond with content type "application/xml", got "text/html"'
+    end
+  end
+
+  describe 'matcher' do
+
+    describe 'on success' do
+      before(:each){ build_response }
+
+      it { should respond_with(200) }
+      it { should respond_with(:ok) }
+      it { should respond_with(:success) }
+      it { should respond_with(200..299) }
+
+      it { should respond_with(200, :content_type => Mime::HTML) }
+      it { should respond_with(:ok, :content_type => Mime::HTML) }
+      it { should respond_with(:success, :content_type => Mime::HTML) }
+      it { should respond_with(200..299, :content_type => Mime::HTML) }
+
+      it { should_not respond_with(404) }
+      it { should_not respond_with(:not_found) }
+      it { should_not respond_with(300..400) }
+    end
+
+    describe 'on missing' do
+      before(:each){ build_response { render :text => "404 Not Found", :status => 404 } }
+
+      it { should respond_with(404) }
+      it { should respond_with(:not_found) }
+      it { should respond_with(:missing) }
+      it { should respond_with(400..405) }
+
+      it { should_not respond_with(302) }
+      it { should_not respond_with(:found) }
+      it { should_not respond_with(:redirect) }
+      it { should_not respond_with(300..305) }
+    end
+
+    describe 'respond_with_body' do
+      before(:each) { build_response { respond_to{ |format| format.xml { render :xml => [].to_xml } } } }
+
+      it { should respond_with_body(%{<?xml version="1.0" encoding="UTF-8"?>\n<nil-classes type="array"/>\n}) }
       it { should respond_with_body(/xml/)       }
       it { should respond_with_body{/xml/}       }
-      it { should respond_with_body proc{/xml/}  }
-      it { should_not respond_with_body('html')  }
-      it { should_not respond_with_body(/html/)  }
-    end
-
-    describe 'on redirect' do
-      before(:each){ build_response { redirect_to project_tasks_url(1) } }
-
-      it { should respond_with(302) }
-      it { should respond_with(:found) }
-      it { should respond_with(:redirect) }
-      it { should respond_with(300..305) }
-
-      it { should_not respond_with(200) }
-      it { should_not respond_with(:ok) }
-      it { should_not respond_with(:success) }
-      it { should_not respond_with(200..299) }
-    end
-
-    describe 'respond_with_content_type' do
-      describe 'and Mime::HTML' do
-        before(:each){ build_response { render :action => :new } }
-
-        it { should respond_with_content_type(:html) }
-        it { should respond_with_content_type(/html/) }
-        it { should respond_with_content_type(Mime::HTML) }
-        it { should respond_with_content_type('text/html') }
-
-        it { should_not respond_with_content_type(:xml) }
-        it { should_not respond_with_content_type(/xml/) }
-        it { should_not respond_with_content_type(Mime::XML) }
-        it { should_not respond_with_content_type('application/xml') }
-      end
-
-      describe 'and Mime::XML' do
-        before(:each) { build_response { respond_to{ |format| format.xml } } }
-
-        it { should respond_with_content_type(:xml) }
-        it { should respond_with_content_type(/xml/) }
-        it { should respond_with_content_type(Mime::XML) }
-        it { should respond_with_content_type('application/xml') }
-
-        it { should_not respond_with_content_type(:html) }
-        it { should_not respond_with_content_type(/html/) }
-        it { should_not respond_with_content_type(Mime::HTML) }
-        it { should_not respond_with_content_type('text/html') }
-      end
-    end
-
-  end
-
-  describe 'macro' do
-
-    describe 'on success' do
-      before(:each){ build_response }
-
-      should_respond_with 200
-      should_respond_with :ok
-      should_respond_with :success
-      should_respond_with 200..299
-
-      should_respond_with 200, :content_type => Mime::HTML
-      should_respond_with :ok, :content_type => Mime::HTML
-      should_respond_with :success, :content_type => Mime::HTML
+      it { should respond_with_body proc{/xml/}  }
+      it { should_not respond_with_body('html')  }
+      it { should_not respond_with_body(/html/)  }
+    end
+
+    describe 'on redirect' do
+      before(:each){ build_response { redirect_to project_tasks_url(1) } }
+
+      it { should respond_with(302) }
+      it { should respond_with(:found) }
+      it { should respond_with(:redirect) }
+      it { should respond_with(300..305) }
+
+      it { should_not respond_with(200) }
+      it { should_not respond_with(:ok) }
+      it { should_not respond_with(:success) }
+      it { should_not respond_with(200..299) }
+    end
+
+    describe 'respond_with_content_type' do
+      describe 'and Mime::HTML' do
+        before(:each){ build_response { render :action => :new } }
+
+        it { should respond_with_content_type(:html) }
+        it { should respond_with_content_type(/html/) }
+        it { should respond_with_content_type(Mime::HTML) }
+        it { should respond_with_content_type('text/html') }
+
+        it { should_not respond_with_content_type(:xml) }
+        it { should_not respond_with_content_type(/xml/) }
+        it { should_not respond_with_content_type(Mime::XML) }
+        it { should_not respond_with_content_type('application/xml') }
+      end
+
+      describe 'and Mime::XML' do
+        before(:each) { build_response { respond_to{ |format| format.xml } } }
+
+        it { should respond_with_content_type(:xml) }
+        it { should respond_with_content_type(/xml/) }
+        it { should respond_with_content_type(Mime::XML) }
+        it { should respond_with_content_type('application/xml') }
+
+        it { should_not respond_with_content_type(:html) }
+        it { should_not respond_with_content_type(/html/) }
+        it { should_not respond_with_content_type(Mime::HTML) }
+        it { should_not respond_with_content_type('text/html') }
+      end
+    end
+
+  end
+
+  describe 'macro' do
+
+    describe 'on success' do
+      before(:each){ build_response }
+
+      should_respond_with 200
+      should_respond_with :ok
+      should_respond_with :success
+      should_respond_with 200..299
+
+      should_respond_with 200, :content_type => Mime::HTML
+      should_respond_with :ok, :content_type => Mime::HTML
+      should_respond_with :success, :content_type => Mime::HTML
       should_respond_with 200..299, :content_type => Mime::HTML
 
       should_respond_with 200 do |m|
         m.body /\s*/
         m.content_type Mime::HTML
-      end
-
-      should_not_respond_with 404
-      should_not_respond_with :not_found
-      should_not_respond_with 300..400
-    end
-
-    describe 'on missing' do
-      before(:each){ build_response { render :text => "404 Not Found", :status => 404 } }
-
-      should_respond_with 404
-      should_respond_with :not_found
-      should_respond_with :missing
-      should_respond_with 400..405
-
-      should_not_respond_with 302
-      should_not_respond_with :found
-      should_not_respond_with :redirect
-      should_not_respond_with 300..305
-    end
-
-    describe 'on redirect' do
-      before(:each){ build_response { redirect_to project_tasks_url(1) } }
-
-      should_respond_with 302
-      should_respond_with :found
-      should_respond_with :redirect
-      should_respond_with 300..305
-
-      should_not_respond_with 200
-      should_not_respond_with :ok
-      should_not_respond_with :success
-      should_not_respond_with 200..299
-    end
-
-    describe 'respond_with_body' do
-      before(:each) { build_response { respond_to{ |format| format.xml { render :xml => [].to_xml } } } }
-
-      should_respond_with_body %{<?xml version="1.0" encoding="UTF-8"?>\n<nil-classes type="array"/>\n}
-      should_respond_with_body /xml/
-      should_not_respond_with_body 'html'
-      should_not_respond_with_body /html/
-    end
-
-    describe 'respond_with_content_type' do
-      describe 'and Mime::HTML' do
-        before(:each){ build_response { render :action => :new } }
-
-        should_respond_with_content_type :html
-        should_respond_with_content_type /html/
-        should_respond_with_content_type Mime::HTML
-        should_respond_with_content_type 'text/html'
-
-        should_not_respond_with_content_type :xml
-        should_not_respond_with_content_type /xml/
-        should_not_respond_with_content_type Mime::XML
-        should_not_respond_with_content_type 'application/xml'
-      end
-
-      describe 'and Mime::XML' do
-        before(:each) { build_response { respond_to{ |format| format.xml } } }
-
-        should_respond_with_content_type :xml
-        should_respond_with_content_type /xml/
-        should_respond_with_content_type Mime::XML
-        should_respond_with_content_type 'application/xml'
-
-        should_not_respond_with_content_type :html
-        should_not_respond_with_content_type /html/
-        should_not_respond_with_content_type Mime::HTML
-        should_not_respond_with_content_type 'text/html'
-      end
-    end
-
-  end
-
-  generate_macro_stubs_specs_for(:respond_with, 200)
-  generate_macro_stubs_specs_for(:respond_with_body, /xml/)
-  generate_macro_stubs_specs_for(:respond_with_content_type, Mime::HTML)
-end
+      end
+
+      should_not_respond_with 404
+      should_not_respond_with :not_found
+      should_not_respond_with 300..400
+    end
+
+    describe 'on missing' do
+      before(:each){ build_response { render :text => "404 Not Found", :status => 404 } }
+
+      should_respond_with 404
+      should_respond_with :not_found
+      should_respond_with :missing
+      should_respond_with 400..405
+
+      should_not_respond_with 302
+      should_not_respond_with :found
+      should_not_respond_with :redirect
+      should_not_respond_with 300..305
+    end
+
+    describe 'on redirect' do
+      before(:each){ build_response { redirect_to project_tasks_url(1) } }
+
+      should_respond_with 302
+      should_respond_with :found
+      should_respond_with :redirect
+      should_respond_with 300..305
+
+      should_not_respond_with 200
+      should_not_respond_with :ok
+      should_not_respond_with :success
+      should_not_respond_with 200..299
+    end
+
+    describe 'respond_with_body' do
+      before(:each) { build_response { respond_to{ |format| format.xml { render :xml => [].to_xml } } } }
+
+      should_respond_with_body %{<?xml version="1.0" encoding="UTF-8"?>\n<nil-classes type="array"/>\n}
+      should_respond_with_body /xml/
+      should_not_respond_with_body 'html'
+      should_not_respond_with_body /html/
+    end
+
+    describe 'respond_with_content_type' do
+      describe 'and Mime::HTML' do
+        before(:each){ build_response { render :action => :new } }
+
+        should_respond_with_content_type :html
+        should_respond_with_content_type /html/
+        should_respond_with_content_type Mime::HTML
+        should_respond_with_content_type 'text/html'
+
+        should_not_respond_with_content_type :xml
+        should_not_respond_with_content_type /xml/
+        should_not_respond_with_content_type Mime::XML
+        should_not_respond_with_content_type 'application/xml'
+      end
+
+      describe 'and Mime::XML' do
+        before(:each) { build_response { respond_to{ |format| format.xml } } }
+
+        should_respond_with_content_type :xml
+        should_respond_with_content_type /xml/
+        should_respond_with_content_type Mime::XML
+        should_respond_with_content_type 'application/xml'
+
+        should_not_respond_with_content_type :html
+        should_not_respond_with_content_type /html/
+        should_not_respond_with_content_type Mime::HTML
+        should_not_respond_with_content_type 'text/html'
+      end
+    end
+
+  end
+
+  generate_macro_stubs_specs_for(:respond_with, 200)
+  generate_macro_stubs_specs_for(:respond_with_body, /xml/)
+  generate_macro_stubs_specs_for(:respond_with_content_type, Mime::HTML)
+end

data/spec/action_controller/route_matcher_spec.rb

@@ -1,83 +1,100 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe 'route_matcher' do
-  controller_name :tasks
-
-  describe 'messages' do
-    before(:each) do
-      @matcher = route(:get, '/projects', :controller => 'boo', :action => 'index')
-    end
-
-    it 'should contain a description message' do
-      @matcher.description.should match(/route GET "\/projects" to\/from/)
-    end
-
-    it 'should set map_to_path? message' do
-      @matcher.matches?(nil)
-      @matcher.failure_message.should match(/Expected to map/)
-    end
-
-    it 'should set map_to_path? message' do
-      @matcher.stub!(:map_to_path?).and_return(true)
-      @matcher.matches?(nil)
-      @matcher.failure_message.should match(/Expected to generate params/)
-    end
-  end
-
-  describe 'matchers' do
-    it { should route(:get,    '/projects',     :controller => :projects, :action => :index) }
-    it { should route(:delete, '/projects/1',   :controller => :projects, :action => :destroy, :id => 1) }
-    it { should route(:get,    '/projects/new', :controller => :projects, :action => :new) }
-
-    # explicitly specify :controller
-    it { should route(:post,   '/projects',     :controller => :projects, :action => :create) }
-
-    # non-string parameter
-    it { should route(:get,    '/projects/1',   :controller => :projects, :action => :show, :id => 1) }
-
-    # string-parameter
-    it { should route(:put,    '/projects/1',   :controller => :projects, :action => :update, :id => "1") }
-
-    # failing case
-    it { should_not route(:get, '/projects',    :controller => :projects, :action => :show) }
-    it { should_not route(:xyz, '/projects',    :controller => :projects, :action => :index) }
-  end
-
-  describe 'macros' do
-    should_route :get,    '/projects',     :controller => :projects, :action => :index
-    should_route :delete, '/projects/1',   :controller => :projects, :action => :destroy, :id => 1
-    should_route :get,    '/projects/new', :controller => :projects, :action => :new
-
-    # explicitly specify :controller
-    should_route :post,   '/projects',     :controller => :projects, :action => :create
-
-    # non-string parameter
-    should_route :get,    '/projects/1',   :controller => :projects, :action => :show,    :id => 1
-
-    # string-parameter
-    should_route :put,    '/projects/1',   :controller => :projects, :action => :update,  :id => "1"
-
-    # failing case
-    should_not_route :get, '/projects',    :controller => :projects, :action => :show
-    should_not_route :xyz, '/projects',    :controller => :projects, :action => :index
-  end
-
-  describe 'using controller.request' do
-    it "should extract environment from controller request" do
-      @matcher = route(:get, '/projects', :controller => 'projects', :action => 'index')
-      ::ActionController::Routing::Routes.should_receive(:extract_request_environment).with(controller.request).and_return({:subdomain => "foo"})
-      ::ActionController::Routing::Routes.should_receive(:recognize_path).with("/projects", {:subdomain => "foo", :method => :get})
-      @matcher.matches?(@controller)
-    end
-  end
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ApplicationController, 'routing', :type => :routing do
+
+  def controller
+    @controller ||= ApplicationController.new
+  end
+
+  describe 'messages' do
+    before(:each) do
+      @matcher = route(:get, '/projects', :controller => 'boo', :action => 'index')
+    end
+
+    it 'should contain a description message' do
+      @matcher.description.should match(/route GET "\/projects" to\/from/)
+    end
+
+    it 'should set map_to_path? message' do
+      @matcher.matches?(nil)
+      @matcher.failure_message.should match(/Expected to map/)
+    end
+
+    it 'should set generate_params? message' do
+      @matcher.stub!(:map_to_path?).and_return(true)
+      @matcher.matches?(controller)
+      @matcher.failure_message.should match(/Expected to generate params/)
+    end
+  end
+
+  describe 'matchers' do
+    it { should route(:get,    '/projects',     :controller => :projects, :action => :index) }
+    it { should route(:delete, '/projects/1',   :controller => :projects, :action => :destroy, :id => 1) }
+    it { should route(:get,    '/projects/new', :controller => :projects, :action => :new) }
+
+    # to syntax
+    it { should route(:get,    '/projects').to(:controller => :projects, :action => :index) }
+    it { should route(:delete, '/projects/1').to(:controller => :projects, :action => :destroy, :id => 1) }
+    it { should route(:get,    '/projects/new').to(:controller => :projects, :action => :new) }
+
+    # from syntax
+    it { should route(:get,    :controller => :projects, :action => :index).from('/projects') }
+    it { should route(:delete, :controller => :projects, :action => :destroy, :id => 1).from('/projects/1') }
+    it { should route(:get,    :controller => :projects, :action => :new).from('/projects/new') }
+
+    # explicitly specify :controller
+    it { should route(:post, '/projects',  :controller => :projects, :action => :create) }
+
+    # non-string parameter
+    it { should route(:get, '/projects/1', :controller => :projects, :action => :show, :id => 1) }
+
+    # string-parameter
+    it { should route(:put, '/projects/1', :controller => :projects, :action => :update, :id => "1") }
+
+    # failing case
+    it { should_not route(:get, '/projects', :controller => :projects, :action => :show) }
+    it { should_not route(:xyz, '/projects', :controller => :projects, :action => :index) }
+  end
+
+  describe 'macros' do
+    should_route :get,    '/projects',     :controller => :projects, :action => :index
+    should_route :delete, '/projects/1',   :controller => :projects, :action => :destroy, :id => 1
+    should_route :get,    '/projects/new', :controller => :projects, :action => :new
+
+    # explicitly specify :controller
+    should_route :post,   '/projects',     :controller => :projects, :action => :create
+
+    # non-string parameter
+    should_route :get,    '/projects/1',   :controller => :projects, :action => :show,    :id => 1
+
+    # string-parameter
+    should_route :put,    '/projects/1',   :controller => :projects, :action => :update,  :id => "1"
+
+    # failing case
+    should_not_route :get, '/projects',    :controller => :projects, :action => :show
+    should_not_route :xyz, '/projects',    :controller => :projects, :action => :index
+  end
+
+  describe 'using controller.request' do
+    it "should extract environment from controller request" do
+      ActionController::Routing::Routes.should_receive(:extract_request_environment).with(controller.request).and_return({:subdomain => "foo"})
+      ActionController::Routing::Routes.should_receive(:recognize_path).with("/projects", {:subdomain => "foo", :method => :get})
+      route(:get, '/projects', :controller => 'projects', :action => 'index').matches?(controller)
+    end
+  end
 end
-
+
 # Test implicit controller
 describe TasksController, :type => :routing do
-  should_route :get,    '/projects/5/tasks',     :action => :index,   :project_id => 5
-  should_route :post,   '/projects/5/tasks',     :action => :create,  :project_id => 5
-  should_route :get,    '/projects/5/tasks/1',   :action => :show,    :id => 1, :project_id => 5
-  should_route :delete, '/projects/5/tasks/1',   :action => :destroy, :id => 1, :project_id => 5
-  should_route :get,    '/projects/5/tasks/new', :action => :new,     :project_id => 5
-  should_route :put,    '/projects/5/tasks/1',   :action => :update,  :id => 1, :project_id => 5
+  should_route :get,    '/projects/5/tasks',     :action => :index,   :project_id => 5
+  should_route :post,   '/projects/5/tasks',     :action => :create,  :project_id => 5
+  should_route :get,    '/projects/5/tasks/1',   :action => :show,    :id => 1, :project_id => 5
+  should_route :delete, '/projects/5/tasks/1',   :action => :destroy, :id => 1, :project_id => 5
+  should_route :get,    '/projects/5/tasks/new', :action => :new,     :project_id => 5
+  should_route :put,    '/projects/5/tasks/1',   :action => :update,  :id => 1, :project_id => 5
+
+  it "should use another controller name if it's given" do
+    self.should_receive(:controller).and_return(ApplicationController.new)
+    route(:get, '/').send(:controller_name).should == 'applications'
+  end
 end