riot_rails 0.0.3 → 0.0.4

data/README.markdown

@@ -2,15 +2,15 @@
 
 [Riot](http://github.com/thumblemonks/riot) macros for Rails application testing.
 
-More to come ...
+LOTS more to come ...
 
 ### ActiveRecord
 
 Standard macros
 
-* should\_validate\_presence\_of
-* should\_allow\_values\_for
-* should\_not\_allow\_values\_for
-* should\_validate\_uniquness\_of
+* #validates\_presence\_of
+* #allows\_values\_for
+* #does\_not\_allow\_values\_for
+* #validates\_uniquness\_of
 
 Yes. Replacing Shoulda macros for now. Like I said with Riot, I love Shoulda.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/riot/active_record/assertion_macros.rb

@@ -0,0 +1,104 @@
+module Riot
+  module ActiveRecord
+
+    module AssertionMacros
+
+      # An ActiveRecord assertion that expects to fail when a given attribute is validated after a nil value
+      # is provided to it.
+      #
+      #    context "a User" do
+      #      setup { User.new }
+      #      topic.validates_presence_of(:name)
+      #    end
+      def validates_presence_of(attribute)
+        msg = "expected to validate presence of #{attribute.inspect}"
+        error_from_writing_value(actual, attribute, nil) || fail(msg)
+      end
+
+      # An ActiveRecord assertion that expects to pass with a given value or set of values for a given
+      # attribute.
+      #
+      #    context "a User" do
+      #      setup { User.new }
+      #      topic.allows_values_for :email, "a@b.cd"
+      #      topic.allows_values_for :email, "a@b.cd", "e@f.gh"
+      #    end
+      def allows_values_for(attribute, *values)
+        bad_values = []
+        values.each do |value|
+          bad_values << value if error_from_writing_value(actual, attribute, value)
+        end
+        msg = "expected #{attribute.inspect} to allow value(s) #{bad_values.inspect}"
+        fail(msg) unless bad_values.empty?
+      end
+
+      # An ActiveRecord assertion that expects to fail with a given value or set of values for a given
+      # attribute.
+      #
+      #    context "a User" do
+      #      setup { User.new }
+      #      topic.does_not_allow_values_for :email, "a"
+      #      topic.does_not_allow_values_for :email, "a@b", "e f@g.h"
+      #    end
+      def does_not_allow_values_for(attribute, *values)
+        good_values = []
+        values.each do |value|
+          good_values << value unless error_from_writing_value(actual, attribute, value)
+        end
+        msg = "expected #{attribute.inspect} not to allow value(s) #{good_values.inspect}"
+        fail(msg) unless good_values.empty?
+      end
+
+      # An ActiveRecord assertion that expects to fail with an attribute is not valid for record because the
+      # value of the attribute is not unique. Requires the topic of the context to be a created record; one
+      # that returns false for a call to +new_record?+.
+      #
+      #    context "a User" do
+      #      setup { User.create(:email => "a@b.cde", ... ) }
+      #      topic.validates_uniqueness_of :email
+      #    end
+      def validates_uniqueness_of(attribute)
+        actual_record = actual
+        if actual_record.new_record?
+          fail("topic is not a new record when testing uniqueness of #{attribute}")
+        else
+          copied_model = actual_record.class.new
+          copied_value = actual_record.read_attribute(attribute)
+          msg = "expected to fail because #{attribute.inspect} is not unique"
+          error_from_writing_value(copied_model, attribute, copied_value) || fail(msg)
+        end
+      end
+
+      # An ActiveRecord assertion macro that expects to pass when a given attribute is defined as +has_many+
+      # association. Will fail if an association is not defined for the attribute and if the association is
+      # not +has_many.
+      #
+      #   context "a Room" do
+      #     setup { Room.new }
+      #
+      #     topic.has_many(:doors)
+      #     topic.has_many(:floors) # should probably fail given our current universe :)
+      #   end
+      def has_many(attribute)
+        reflection = actual.class.reflect_on_association(attribute)
+        static_msg = "expected #{attribute.inspect} to be a has_many association, but was "
+        if reflection.nil?
+          fail(static_msg + "not")
+        elsif "has_many" != reflection.macro.to_s
+          fail(static_msg + "a #{reflection.macro} instead")
+        end
+      end
+    private
+
+      def error_from_writing_value(model, attribute, value)
+        model.write_attribute(attribute, value)
+        model.valid?
+        model.errors.on(attribute)
+      end
+
+    end # AssertionMacros
+
+  end # ActiveRecord
+end # Riot
+
+Riot::Assertion.instance_eval { include Riot::ActiveRecord::AssertionMacros }

data/lib/riot/active_record.rb

@@ -1,2 +1 @@
-require 'riot/active_record/context_macros'
-require 'riot/active_record/situation_macros'
+require 'riot/active_record/assertion_macros'

data/riot_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot_rails}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-18}
   s.description = %q{Riot specific test support for Rails apps. Protest the slow app.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [
@@ -26,8 +26,7 @@ Gem::Specification.new do |s|
      "lib/riot/action_controller/context_macros.rb",
      "lib/riot/action_controller/situation_macros.rb",
      "lib/riot/active_record.rb",
-     "lib/riot/active_record/context_macros.rb",
-     "lib/riot/active_record/situation_macros.rb",
+     "lib/riot/active_record/assertion_macros.rb",
      "lib/riot/rails.rb",
      "rails/init.rb",
      "riot_rails.gemspec",
@@ -37,9 +36,10 @@ Gem::Specification.new do |s|
      "test/action_controller/renders_template_test.rb",
      "test/action_controller/renders_test.rb",
      "test/action_controller/response_status_test.rb",
-     "test/active_record/should_allow_values_for_test.rb",
-     "test/active_record/should_validate_presence_of_test.rb",
-     "test/active_record/should_validate_uniqueness_of_test.rb",
+     "test/active_record/allowing_values_test.rb",
+     "test/active_record/has_many_test.rb",
+     "test/active_record/validates_presence_of_test.rb",
+     "test/active_record/validates_uniqueness_of_test.rb",
      "test/rails_root/app/views/rendered_templates/foo_bar.html.erb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/schema.rb",
@@ -57,9 +57,10 @@ Gem::Specification.new do |s|
      "test/action_controller/renders_template_test.rb",
      "test/action_controller/renders_test.rb",
      "test/action_controller/response_status_test.rb",
-     "test/active_record/should_allow_values_for_test.rb",
-     "test/active_record/should_validate_presence_of_test.rb",
-     "test/active_record/should_validate_uniqueness_of_test.rb",
+     "test/active_record/allowing_values_test.rb",
+     "test/active_record/has_many_test.rb",
+     "test/active_record/validates_presence_of_test.rb",
+     "test/active_record/validates_uniqueness_of_test.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/schema.rb",
      "test/teststrap.rb"

data/test/active_record/{should_allow_values_for_test.rb → allowing_values_test.rb}

@@ -1,36 +1,36 @@
 require 'teststrap'
 
-context "should_allow_values_for" do
+context "allows_values_for" do
   setup_and_run_context("when attribute allows a value", 1, 0, 0) do |test_ctx|
     test_ctx.setup { Room.new }
-    test_ctx.should_allow_values_for :email, "a@b.cd"
+    test_ctx.topic.allows_values_for :email, "a@b.cd"
   end
 
-  setup_and_run_context("when attribute allows multiple values", 2, 0, 0) do |test_ctx|
+  setup_and_run_context("when attribute allows multiple values", 1, 0, 0) do |test_ctx|
     test_ctx.setup { Room.new }
-    test_ctx.should_allow_values_for :email, "a@b.cd", "e@f.gh"
+    test_ctx.topic.allows_values_for :email, "a@b.cd", "e@f.gh"
   end
 
-  setup_and_run_context("when attribute is provided a valid and an invalid value", 1, 1, 0) do |test_ctx|
+  setup_and_run_context("when attribute is provided a valid and an invalid value", 0, 1, 0) do |test_ctx|
     test_ctx.setup { Room.new }
-    test_ctx.should_allow_values_for :email, "a", "e@f.gh"
+    test_ctx.topic.allows_values_for :email, "a", "e@f.gh"
   end
-end # should_allow_values_for
+end # allows_values_for
 
-context "should_not_allow_values_for" do
+context "does_not_allow_values_for" do
   setup_and_run_context("when attribute does not allow a value", 1, 0, 0) do |test_ctx|
     test_ctx.setup { Room.new }
-    test_ctx.should_not_allow_values_for :email, "a"
+    test_ctx.topic.does_not_allow_values_for :email, "a"
     test_ctx.assertions.each {|a| STDOUT.puts a.raised if a.errored?}
   end
 
-  setup_and_run_context("when attribute does not allow multiple values", 2, 0, 0) do |test_ctx|
+  setup_and_run_context("when attribute does not allow multiple values", 1, 0, 0) do |test_ctx|
     test_ctx.setup { Room.new }
-    test_ctx.should_not_allow_values_for :email, "a", "e"
+    test_ctx.topic.does_not_allow_values_for :email, "a", "e"
   end
 
-  setup_and_run_context("when attribute is provided a valid and an invalid value", 1, 1, 0) do |test_ctx|
+  setup_and_run_context("when attribute is provided a valid and an invalid value", 0, 1, 0) do |test_ctx|
     test_ctx.setup { Room.new }
-    test_ctx.should_not_allow_values_for :email, "a", "e@f.gh"
+    test_ctx.topic.does_not_allow_values_for :email, "a", "e@f.gh"
   end
-end # should_not_allow_values_for
+end # does_not_allow_values_for

data/test/active_record/has_many_test.rb

@@ -0,0 +1,46 @@
+require 'teststrap'
+
+context "testing has_many" do
+
+  setup do
+    context = Riot::Context.new("has_many test context", Riot::NilReport.new)
+    context.setup { Room.new }
+    context.topic
+  end
+
+  context "when record has a has_many association defined for attribute" do
+    setup do
+      topic.has_many(:doors)
+      topic
+    end
+    
+    asserts("assertion passed") { topic.passed? }
+  end # when record has a has_many association defined for attribute
+
+  context "when record does not have a has_many association defined for attribute" do
+    setup do
+      topic.has_many(:windows)
+      topic
+    end
+
+    asserts("assertion failed") { topic.failed? }
+
+    asserts("failure message") do
+      topic.result.message
+    end.matches(/expected :windows to be a has_many association, but was not/)
+  end # when record does not have a has_many association defined for attribute
+
+  context "when attribute is not a has_many, but is a has_one association" do
+    setup do
+      topic.has_many(:floor)
+      topic
+    end
+
+    asserts("assertion failed") { topic.failed? }
+
+    asserts("failure message") do
+      topic.result.message
+    end.matches(/expected :floor to be a has_many association, but was a has_one instead/)
+  end # when attribute is not a has_many, but is a has_one association
+
+end # testing has_many

data/test/active_record/validates_presence_of_test.rb

@@ -0,0 +1,13 @@
+require 'teststrap'
+
+context "validates_presence_of" do
+  setup_and_run_context("when attribute requires presence", 1, 0, 0) do |test_ctx|
+    test_ctx.setup { Room.new }
+    test_ctx.topic.validates_presence_of(:location)
+  end
+
+  setup_and_run_context("when attribute does not require presence", 0, 1, 0) do |test_ctx|
+    test_ctx.setup { Room.new }
+    test_ctx.topic.validates_presence_of(:contents)
+  end
+end # validates_presence_of

data/test/active_record/validates_uniqueness_of_test.rb

@@ -0,0 +1,20 @@
+require 'teststrap'
+
+context "validates_uniqueness_of" do
+
+  setup_and_run_context("without a persisted record", 0, 1, 0) do |test_ctx|
+    test_ctx.setup { Room.new(:email => "foo@bar.baz") }
+    test_ctx.topic.validates_uniqueness_of :email
+  end
+
+  setup_and_run_context("with a persisted record", 1, 0, 0) do |test_ctx|
+    test_ctx.setup { Room.create_with_good_data(:email => "foo@bar.baz") }
+    test_ctx.topic.validates_uniqueness_of :email
+  end
+
+  setup_and_run_context("with a persisted record but not validating uniqueness", 0, 1, 0) do |test_ctx|
+    test_ctx.setup { Room.create_with_good_data(:email => "goo@car.caz") }
+    test_ctx.topic.validates_uniqueness_of :foo
+  end
+
+end # validates_uniqueness_of

data/test/teststrap.rb

@@ -32,6 +32,9 @@ class Room < ActiveRecord::Base
   validates_format_of :email, :with => /^\w+@\w+\.\w+$/
   validates_uniqueness_of :email
 
+  has_many :doors
+  has_one :floor
+
   def self.create_with_good_data(attributes={})
     create!({:location => "a", :foo => "b", :bar => "c", :email => "a@b.c"}.merge(attributes))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -05:00
+date: 2009-10-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,8 +51,7 @@ files:
 - lib/riot/action_controller/context_macros.rb
 - lib/riot/action_controller/situation_macros.rb
 - lib/riot/active_record.rb
-- lib/riot/active_record/context_macros.rb
-- lib/riot/active_record/situation_macros.rb
+- lib/riot/active_record/assertion_macros.rb
 - lib/riot/rails.rb
 - rails/init.rb
 - riot_rails.gemspec
@@ -62,9 +61,10 @@ files:
 - test/action_controller/renders_template_test.rb
 - test/action_controller/renders_test.rb
 - test/action_controller/response_status_test.rb
-- test/active_record/should_allow_values_for_test.rb
-- test/active_record/should_validate_presence_of_test.rb
-- test/active_record/should_validate_uniqueness_of_test.rb
+- test/active_record/allowing_values_test.rb
+- test/active_record/has_many_test.rb
+- test/active_record/validates_presence_of_test.rb
+- test/active_record/validates_uniqueness_of_test.rb
 - test/rails_root/app/views/rendered_templates/foo_bar.html.erb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/schema.rb
@@ -104,9 +104,10 @@ test_files:
 - test/action_controller/renders_template_test.rb
 - test/action_controller/renders_test.rb
 - test/action_controller/response_status_test.rb
-- test/active_record/should_allow_values_for_test.rb
-- test/active_record/should_validate_presence_of_test.rb
-- test/active_record/should_validate_uniqueness_of_test.rb
+- test/active_record/allowing_values_test.rb
+- test/active_record/has_many_test.rb
+- test/active_record/validates_presence_of_test.rb
+- test/active_record/validates_uniqueness_of_test.rb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/schema.rb
 - test/teststrap.rb

data/lib/riot/active_record/context_macros.rb

@@ -1,69 +0,0 @@
-module Riot
-  module ActiveRecord
-
-    module ContextMacros
-      # An ActiveRecord assertion that expects to fail when a given attribute or attributes are validated
-      # when a nil value is provided to them.
-      #
-      # Example
-      #    should_validate_presence_of :name
-      #    should_validate_presence_of :name, :email
-      def should_validate_presence_of(*attributes)
-        attributes.each do |attribute|
-          should("require value for #{attribute}") do
-            get_error_from_writing_value(topic, attribute, nil)
-          end.exists
-        end
-      end
-
-      # An ActiveRecord assertion that expects to pass with a given value or set of values for a given
-      # attribute.
-      #
-      # Example
-      #    should_allow_values_for :email, "a@b.cd"
-      #    should_allow_values_for :email, "a@b.cd", "e@f.gh"
-      def should_allow_values_for(attribute, *values)
-        values.each do |value|
-          should("allow value of \"#{value}\" for #{attribute}") do
-            get_error_from_writing_value(topic, attribute, value)
-          end.nil
-        end
-      end
-
-      # An ActiveRecord assertion that expects to fail with a given value or set of values for a given
-      # attribute.
-      #
-      # Example
-      #    should_not_allow_values_for :email, "a"
-      #    should_not_allow_values_for :email, "a", "foo.bar"
-      def should_not_allow_values_for(attribute, *values)
-        values.each do |value|
-          should("allow value of \"#{value}\" for #{attribute}") do
-            get_error_from_writing_value(topic, attribute, value)
-          end.exists
-        end
-      end
-
-      # An ActiveRecord assertion that expects to fail with an attribute is not valid for record because the
-      # value of the attribute is not unique. Requires the topic of the context to be a created record; one
-      # that returns false for a call to +new_record?+.
-      #
-      # Example
-      #    should_validate_uniqueness_of :email
-      def should_validate_uniqueness_of(attribute)
-        asserts "topic is not a new record when testing uniqueness of #{attribute}" do
-          !topic.new_record?
-        end
-
-        should "require #{attribute} to be a unique value" do
-          copied_model = topic.class.new
-          copied_value = topic.read_attribute(attribute)
-          get_error_from_writing_value(copied_model, attribute, copied_value)
-        end.exists
-      end
-    end # ContextMacros
-
-  end # ActiveRecord
-end # Riot
-
-Riot::Context.instance_eval { include Riot::ActiveRecord::ContextMacros }

data/lib/riot/active_record/situation_macros.rb

@@ -1,16 +0,0 @@
-module Riot
-  module ActiveRecord
-
-    module SituationMacros
-    private
-      def get_error_from_writing_value(model, attribute, value)
-        model.write_attribute(attribute, value)
-        model.valid?
-        model.errors.on(attribute)
-      end
-    end # SituationMacros
-
-  end # ActiveRecord
-end # Riot
-
-Riot::Situation.instance_eval { include Riot::ActiveRecord::SituationMacros }

data/test/active_record/should_validate_presence_of_test.rb

@@ -1,18 +0,0 @@
-require 'teststrap'
-
-context "should_validate_presence_of" do
-  setup_and_run_context("when attribute requires presence", 1, 0, 0) do |test_ctx|
-    test_ctx.setup { Room.new }
-    test_ctx.should_validate_presence_of :location
-  end
-
-  setup_and_run_context("when attribute does not require presence", 0, 1, 0) do |test_ctx|
-    test_ctx.setup { Room.new }
-    test_ctx.should_validate_presence_of :contents
-  end
-
-  setup_and_run_context("with multiple attributes required but not valid", 2, 0, 0) do |test_ctx|
-    test_ctx.setup { Room.new }
-    test_ctx.should_validate_presence_of :foo, :bar
-  end
-end # should_validate_presence_of

data/test/active_record/should_validate_uniqueness_of_test.rb

@@ -1,20 +0,0 @@
-require 'teststrap'
-
-context "should_validate_uniqueness_of" do
-
-  setup_and_run_context("without a persisted record", 0, 2, 0) do |test_ctx|
-    test_ctx.setup { Room.new(:email => "foo@bar.baz") }
-    test_ctx.should_validate_uniqueness_of :email
-  end
-
-  setup_and_run_context("with a persisted record", 2, 0, 0) do |test_ctx|
-    test_ctx.setup { Room.create_with_good_data(:email => "foo@bar.baz") }
-    test_ctx.should_validate_uniqueness_of :email
-  end
-
-  setup_and_run_context("with a persisted record but not validating uniqueness", 1, 1, 0) do |test_ctx|
-    test_ctx.setup { Room.create_with_good_data(:email => "goo@car.caz") }
-    test_ctx.should_validate_uniqueness_of :foo
-  end
-
-end # should_validate_presence_of