Skip to content

Commit

Permalink
Better method name.
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabe Berke-Williams committed Apr 20, 2012
1 parent b68d711 commit c358d57
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
8 changes: 5 additions & 3 deletions spec/shoulda/action_controller/assign_to_matcher_spec.rb
Expand Up @@ -2,12 +2,14 @@

describe Shoulda::Matchers::ActionController::AssignToMatcher do
it "should include the actual class in the failure message" do
define_constant(:WrongClass) do
def to_s; "wrong class" end
define_class(:WrongClass) do
def to_s
'wrong class'
end
end

controller = build_response { @var = WrongClass.new }
matcher = Shoulda::Matchers::ActionController::AssignToMatcher.new(:var).with_kind_of(Fixnum)
matcher = assign_to(:var).with_kind_of(Fixnum)
matcher.matches?(controller)

matcher.failure_message.should =~ /but got wrong class \(WrongClass\)$/
Expand Down
2 changes: 1 addition & 1 deletion spec/shoulda/active_record/serialize_matcher_spec.rb
Expand Up @@ -59,7 +59,7 @@

context "a serializer that is an instance of a class" do
before do
define_constant(:ExampleSerializer, Object) do
define_class(:ExampleSerializer, Object) do
def load(*); end
def dump(*); end
end
Expand Down
10 changes: 5 additions & 5 deletions spec/support/model_builder.rb
Expand Up @@ -28,7 +28,7 @@ def create_table(table_name, options = {}, &block)
end
end

def define_constant(class_name, base = Object, &block)
def define_class(class_name, base = Object, &block)
class_name = class_name.to_s.camelize

Class.new(base).tap do |constant_class|
Expand All @@ -46,11 +46,11 @@ def define_constant(class_name, base = Object, &block)
end

def define_model_class(class_name, &block)
define_constant(class_name, ActiveRecord::Base, &block)
define_class(class_name, ActiveRecord::Base, &block)
end

def define_active_model_class(class_name, options = {}, &block)
define_constant(class_name, Object) do
define_class(class_name, Object) do
include ActiveModel::Validations

options[:accessors].each do |column|
Expand Down Expand Up @@ -78,13 +78,13 @@ def define_model(name, columns = {}, &block)

def define_mailer(name, paths, &block)
class_name = name.to_s.pluralize.classify
define_constant(class_name, ActionMailer::Base, &block)
define_class(class_name, ActionMailer::Base, &block)
end

def define_controller(class_name, &block)
class_name = class_name.to_s
class_name << 'Controller' unless class_name =~ /Controller$/
define_constant(class_name, ActionController::Base, &block)
define_class(class_name, ActionController::Base, &block)
end

def define_routes(&block)
Expand Down

0 comments on commit c358d57

Please sign in to comment.