aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-07-21 00:51:57 -0500
committerJoshua Peek <josh@joshpeek.com>2009-07-21 00:51:57 -0500
commit92c00d75869b173f44ff9d68f219a99e6dc3bd82 (patch)
treea5c11b3810d7739de8dcac6cedaa2879810de4a8 /actionpack/test/controller
parent6944b391cddbf1a3ffb3ac4ac588fa4b3d50f430 (diff)
downloadrails-92c00d75869b173f44ff9d68f219a99e6dc3bd82.tar.gz
rails-92c00d75869b173f44ff9d68f219a99e6dc3bd82.tar.bz2
rails-92c00d75869b173f44ff9d68f219a99e6dc3bd82.zip
AMo conversion helper
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/record_identifier_test.rb3
-rw-r--r--actionpack/test/controller/redirect_test.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb
index 10f51639cf..44e49ed3f8 100644
--- a/actionpack/test/controller/record_identifier_test.rb
+++ b/actionpack/test/controller/record_identifier_test.rb
@@ -1,7 +1,8 @@
require 'abstract_unit'
class Comment
- extend ActiveModel::APICompliant
+ extend ActiveModel::Naming
+ include ActiveModel::Conversion
attr_reader :id
def save; @id = 1 end
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index a71c39e504..b3321303c0 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -4,7 +4,8 @@ class WorkshopsController < ActionController::Base
end
class Workshop
- extend ActiveModel::APICompliant
+ extend ActiveModel::Naming
+ include ActiveModel::Conversion
attr_accessor :id, :new_record
def initialize(id, new_record)