resource_controller 0.5.3 → 0.6.6

data/test/db/migrate/013_create_personnel.rb

@@ -0,0 +1,11 @@
+class CreatePersonnel < ActiveRecord::Migration
+  def self.up
+    create_table :personnel, :force => true do |t|
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :personnel
+  end
+end

data/test/db/migrate/014_add_personnel_id_to_photos.rb

@@ -0,0 +1,9 @@
+class AddPersonnelIdToPhotos < ActiveRecord::Migration
+  def self.up
+    add_column :photos, :personnel_id, :integer
+  end
+
+  def self.down
+    remove_column :photos, :personnel_id
+  end
+end

data/test/db/schema.rb

@@ -1,5 +1,5 @@
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
+# please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 12) do
+ActiveRecord::Schema.define(:version => 14) do
 
   create_table "accounts", :force => true do |t|
     t.string "name"
@@ -33,9 +33,15 @@ ActiveRecord::Schema.define(:version => 12) do
     t.string  "title"
   end
 
+  create_table "personnel", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "photos", :force => true do |t|
     t.string  "title"
     t.integer "account_id"
+    t.integer "personnel_id"
   end
 
   create_table "photos_tags", :force => true do |t|
@@ -45,7 +51,7 @@ ActiveRecord::Schema.define(:version => 12) do
 
   create_table "posts", :force => true do |t|
     t.string "title", :default => ""
-    t.text   "body"
+    t.text   "body",  :default => ""
   end
 
   create_table "products", :force => true do |t|

data/test/test/fixtures/personnel.yml

@@ -0,0 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+two:
+  id: 2

data/test/test/functional/cms/options_controller_test.rb

@@ -4,7 +4,7 @@ require 'cms/options_controller'
 # Re-raise errors caught by the controller.
 class Cms::OptionsController; def rescue_action(e) raise e end; end
 
-class Cms::OptionsControllerTest < Test::Unit::TestCase
+class Cms::OptionsControllerTest < ActionController::TestCase
   def setup
     @controller = Cms::OptionsController.new
     @request    = ActionController::TestRequest.new

data/test/test/functional/cms/photos_controller_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'cms/photos_controller'
+
+# Re-raise errors caught by the controller.
+class Cms::PhotosController; def rescue_action(e) raise e end; end
+
+class Cms::PhotosControllerTest < ActionController::TestCase
+  def setup
+    @controller = Cms::PhotosController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @photo      = Photo.find 1
+  end
+  
+  context "with personnel as parent" do
+    context "on get to :index" do
+      setup do
+        get :index, :personnel_id => 1
+      end
+
+      should_respond_with :success
+      should_render_template "index"
+      should_assign_to :photos
+      should_assign_to :personnel
+      should "scope photos to personnel" do
+        assert assigns(:photos).all? { |photo| photo.personnel.id == 1 }
+      end
+    end
+    
+    context "on post to :create" do
+      setup do
+        post :create, :personnel_id => 1, :photo => {}
+      end
+
+      should_redirect_to 'cms_personnel_photo_path(@photo.personnel, @photo)'
+      should_assign_to :photo
+      should_assign_to :personnel
+      should "scope photo to personel" do
+        assert personnel(:one), assigns(:photo).personnel
+      end
+    end
+  end
+end

data/test/test/functional/cms/products_controller_test.rb

@@ -4,7 +4,7 @@ require 'cms/products_controller'
 # Re-raise errors caught by the controller.
 class Cms::ProductsController; def rescue_action(e) raise e end; end
 
-class Cms::ProductsControllerTest < Test::Unit::TestCase
+class Cms::ProductsControllerTest < ActionController::TestCase
   def setup
     @controller = Cms::ProductsController.new
     @request    = ActionController::TestRequest.new

data/test/test/functional/comments_controller_test.rb

@@ -1,15 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'comments_controller'
 
-# Re-raise errors caught by the controller.
-class CommentsController; def rescue_action(e) raise e end; end
-
-class CommentsControllerTest < Test::Unit::TestCase
+class CommentsControllerTest < ActionController::TestCase
   def setup
-    @controller = CommentsController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @comment    = Comment.find 1
+    @comment = Comment.find 1
   end
   
   context "with parent post" do

data/test/test/functional/images_controller_test.rb

@@ -1,14 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'images_controller'
 
-# Re-raise errors caught by the controller.
-class ImagesController; def rescue_action(e) raise e end; end
-
-class ImagesControllerTest < Test::Unit::TestCase
+class ImagesControllerTest < ActionController::TestCase
   def setup
-    @controller           = ImagesController.new
-    @request              = ActionController::TestRequest.new
-    @response             = ActionController::TestResponse.new
     @image = images :one
   end
 

data/test/test/functional/people_controller_test.rb

@@ -1,15 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'people_controller'
 
-# Re-raise errors caught by the controller.
-class PeopleController; def rescue_action(e) raise e end; end
-
-class PeopleControllerTest < Test::Unit::TestCase
+class PeopleControllerTest < ActionController::TestCase
   def setup
-    @controller = PeopleController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @person     = accounts :one
+    @person = accounts :one
   end
 
   should_be_restful do |resource|

data/test/test/functional/photos_controller_test.rb

@@ -1,15 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'photos_controller'
 
-# Re-raise errors caught by the controller.
-class PhotosController; def rescue_action(e) raise e end; end
-
-class PhotosControllerTest < Test::Unit::TestCase
+class PhotosControllerTest < ActionController::TestCase
   def setup
-    @controller = PhotosController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @photo      = Photo.find 1
+    @photo = Photo.find 1
   end
 
   context "actions specified" do

data/test/test/functional/posts_controller_test.rb

@@ -1,15 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'posts_controller'
 
-# Re-raise errors caught by the controller.
-class PostsController; def rescue_action(e) raise e end; end
-
-class PostsControllerTest < Test::Unit::TestCase
+class PostsControllerTest < ActionController::TestCase
   def setup
-    @controller = PostsController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @post       = Post.find 1
+    @post = Post.find 1
   end
   
   should_be_restful do |resource|

data/test/test/functional/projects_controller_test.rb

@@ -1,18 +1,21 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'projects_controller'
 
-# Re-raise errors caught by the controller.
-class ProjectsController; def rescue_action(e) raise e end; end
-
-class ProjectsControllerTest < Test::Unit::TestCase
+class ProjectsControllerTest < ActionController::TestCase
   def setup
-    @controller = ProjectsController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @project    = projects :one
+    @project = projects :one
   end
 
   should_be_restful do |resource|
     resource.formats = [:html]
   end
+
+  context "on DELETE to :destroy that fails" do
+    setup do
+      Project.any_instance.stubs(:destroy).returns(false)
+      delete :destroy, :id => @project.to_param
+    end
+
+    should_respond_with :redirect
+    should_redirect_to "project_url(@project)"
+  end
 end

data/test/test/functional/somethings_controller_test.rb

@@ -1,15 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'somethings_controller'
 
-# Re-raise errors caught by the controller.
-class SomethingsController; def rescue_action(e) raise e end; end
-
-class SomethingsControllerTest < Test::Unit::TestCase
+class SomethingsControllerTest < ActionController::TestCase
   def setup
-    @controller = SomethingsController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @something  = somethings :one
+    @something = somethings :one
   end
 
   context "actions specified" do

data/test/test/functional/tags_controller_test.rb

@@ -1,15 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'tags_controller'
 
-# Re-raise errors caught by the controller.
-class TagsController; def rescue_action(e) raise e end; end
-
-class TagsControllerTest < Test::Unit::TestCase
+class TagsControllerTest < ActionController::TestCase
   def setup
-    @controller = TagsController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @tag        = Tag.find 1
+    @tag = Tag.find 1
   end
   
   context "with photo as parent" do

data/test/test/functional/users_controller_test.rb

@@ -1,15 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'users_controller'
 
-# Re-raise errors caught by the controller.
-class UsersController; def rescue_action(e) raise e end; end
-
-class UsersControllerTest < Test::Unit::TestCase
+class UsersControllerTest < ActionController::TestCase
   def setup
-    @controller = UsersController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @dude       = accounts :one
+    @dude = accounts :one
   end
 
   should_be_restful do |resource|

data/test/test/test_helper.rb

@@ -1,12 +1,13 @@
 $:.reject! { |path| path.include? 'TextMate' }
+require 'test/unit'
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 require 'mocha'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
-  
-  load_all_fixtures
+
+  fixtures :all
 end

data/test/test/unit/accessors_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/../test_helper'
 
-class AccessorsTest < Test::Unit::TestCase
+class AccessorsTest < ActiveSupport::TestCase
   def setup
     PostsController.class_eval do
       extend ResourceController::Accessors
@@ -107,4 +107,4 @@ class AccessorsTest < Test::Unit::TestCase
     end
   end
   
-end
+end

data/test/test/unit/account_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class PersonTest < Test::Unit::TestCase
+class PersonTest < ActiveSupport::TestCase
   def test_truth
     assert true
   end

data/test/test/unit/action_options_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/../test_helper'
 
-class ActionOptionsTest < Test::Unit::TestCase
+class ActionOptionsTest < ActiveSupport::TestCase
   def setup
     @controller = PostsController.new
     @create     = ResourceController::ActionOptions.new

data/test/test/unit/base_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/../test_helper'
 
-class BaseTest < Test::Unit::TestCase
+class BaseTest < ActiveSupport::TestCase
   def setup
     @controller = ResourceController::Base.new
   end

data/test/test/unit/comment_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class CommentTest < Test::Unit::TestCase
+class CommentTest < ActiveSupport::TestCase
   fixtures :comments
 
   # Replace this with your real tests.

data/test/test/unit/failable_action_options_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/../test_helper'
 
-class FailableActionOptionsTest < Test::Unit::TestCase
+class FailableActionOptionsTest < ActiveSupport::TestCase
   def setup
     @controller = PostsController.new
     @create = ResourceController::FailableActionOptions.new

data/test/test/unit/helpers_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/../test_helper'
 
-class HelpersTest < Test::Unit::TestCase
+class HelpersTest < ActiveSupport::TestCase
   
   def setup
     @controller = PostsController.new

data/test/test/unit/image_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ImageTest < Test::Unit::TestCase
+class ImageTest < ActiveSupport::TestCase
   def test_truth
     assert true
   end

data/test/test/unit/option_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class OptionTest < Test::Unit::TestCase
+class OptionTest < ActiveSupport::TestCase
   fixtures :options
 
   # Replace this with your real tests.

data/test/test/unit/photo_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class PhotoTest < Test::Unit::TestCase
+class PhotoTest < ActiveSupport::TestCase
   fixtures :photos
 
   # Replace this with your real tests.

data/test/test/unit/post_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class PostTest < Test::Unit::TestCase
+class PostTest < ActiveSupport::TestCase
   fixtures :posts
 
   # Replace this with your real tests.

data/test/test/unit/project_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ProjectTest < Test::Unit::TestCase
+class ProjectTest < ActiveSupport::TestCase
   fixtures :projects
 
   # Replace this with your real tests.

data/test/test/unit/response_collector_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/../test_helper'
 
-class ResponseCollectorTest < Test::Unit::TestCase
+class ResponseCollectorTest < ActiveSupport::TestCase
   context "yielding a block to a collector object" do
     setup do
       @collector = ResourceController::ResponseCollector.new