Merge branch '99-rails3' of http://github.com/davidpaniz/restfulie in…

…to 99-rails3
caelum · Aug 18, 2010 · 7beb5d2 · 7beb5d2
2 parents f6be001 + dc90fc6
commit 7beb5d2
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 22 deletions.
diff --git a/lib/restfulie/server/action_controller/created_responder.rb b/lib/restfulie/server/action_controller/created_responder.rb
@@ -6,7 +6,7 @@ module ActionController
       module CreatedResponder
 
         def to_format
-          if [201, :created].include? options[:status]
+          if (options[:status] == 201) || (options[:status] == :created)
             head :status => 201, :location => controller.url_for(resource)
           else
             super

diff --git a/spec/restfulie/server/action_controller/created_responder_spec.rb b/spec/restfulie/server/action_controller/created_responder_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Type do
+
+end
diff --git a/...pec/controllers/albums_controller_spec.rb → ...ers/integration/albums_controller_spec.rb b/...pec/controllers/albums_controller_spec.rb → ...ers/integration/albums_controller_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe AlbumsController do
 

diff --git a/...lers/cacheable_clients_controller_spec.rb → ...tion/cacheable_clients_controller_spec.rb b/...lers/cacheable_clients_controller_spec.rb → ...tion/cacheable_clients_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe CacheableClientsController do
   before(:each) do

diff --git a/...tion_controller/created_responder_spec.rb → ...ers/integration/created_responder_spec.rb b/...tion_controller/created_responder_spec.rb → ...ers/integration/created_responder_spec.rb
@@ -15,24 +15,20 @@ def create
 
 end
 
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/:action/:id'
-end
-
-describe CreationController, :type => :controller do
-
-  before(:each) do
-    request.accept = "application/atom+xml"
-  end
+describe CreationController do
 
   context "creating a resource" do
 
     it "should return 201 with location" do
+      request.accept = "application/atom+xml"
+
       uri = "http://newlocation.com/uri"
-      controller.should_receive(:url_for).and_return uri
+
+      controller.stub(:url_for).and_return uri
+
       post :create
-      controller.response.code.should == "201"
-      controller.response.headers["Location"].should == uri
+      response.code.should == "201"
+      response.headers["Location"].should == uri
     end
 
   end      

diff --git a/...c/controllers/projects_controller_spec.rb → ...s/integration/projects_controller_spec.rb b/...c/controllers/projects_controller_spec.rb → ...s/integration/projects_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe ProjectsController do
 

diff --git a/tests/spec/controllers/songs_controller_spec.rb b/tests/spec/controllers/songs_controller_spec.rb