assert-moar 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b595017d995e899c740e8e73050f8d76bf3fb7b
-  data.tar.gz: 7b1e2418576d038218a1a097df0b871e2befe08d
+  metadata.gz: 0e84a3b9014385250895e77106131c496e61c636
+  data.tar.gz: 84c529c012b077a7575193e5f06b1458dc2ade81
 SHA512:
-  metadata.gz: d4b3efcf9894fdca235c6ee6cac5ed032fd0578ec119c54640e40a2dadbfbd6e72bb158b3228578d41276183df4010a546ab33c2dcd1c8a2f76344d0a70fa342
-  data.tar.gz: f3e5bfc9bc9ccdc5f594e16268f3696d9c0b6a2b02126e343845c8966958e569a47e50abf64d8f11a4c31ff7d3cfdac105482c4b47e4ceeccc30890580163b83
+  metadata.gz: 6a8eaa0eb6c40bc4c02cc0593808a193f893cb46368a0276a0c2ebfdc1e2c760985bd7101cddd83b1588a3db7ea08d1f3421738fcee63e2014926b52d4d4f40c
+  data.tar.gz: ffa217da9d619ab9bbdb4e8afa786c038370f49690be4867cd9165c0e562110f01a11ddc78bf5b9c54b845c8e059d7fe0cecff50fe6d084c1a6b66cf42fffe75

data/assert-moar.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "faker"
+  spec.add_development_dependency "awesome_print"
 end

data/lib/assert_moar.rb

@@ -1,4 +1,5 @@
 require 'assert_moar/version'
+require 'assert_moar/assertions'
 
 module AssertMoar
 end

data/lib/assert_moar/assertions.rb

@@ -0,0 +1,38 @@
+module AssertMoar::Assertions
+  def assert_validates_presence_of(object, property)
+    assert has_validator?(object, property, ::ActiveModel::Validations::PresenceValidator),
+      "#{object} does not validate the presence of #{property}"
+  end
+
+  def refute_validates_presence_of(object, property)
+    refute has_validator?(object, property, ::ActiveModel::Validations::PresenceValidator),
+      "#{object} validates presence of #{property}"
+  end
+
+  def assert_validates_uniqueness_of(object, property)
+    assert has_validator?(object, property, ::ActiveRecord::Validations::UniquenessValidator),
+      "#{object} does not validate the presence of #{property}"
+  end
+
+  def refute_validates_uniqueness_of(object, property)
+    refute has_validator?(object, property, ::ActiveRecord::Validations::UniquenessValidator),
+      "#{object} validates presence of #{property}"
+  end
+
+  def assert_valid(object)
+    assert object.valid?, "Expected object to be valid"
+  end
+
+  def refute_valid object
+    refute object.valid?, "Expected object to not be valid"
+  end
+
+  private
+  def has_validator?(object_or_class, property, validator_class)
+    klass = object_or_class.class
+    property = property.to_sym
+    validators = Array(klass._validators[property])
+
+    validators.any? { |v| v.is_a?(validator_class) }
+  end
+end

data/lib/assert_moar/version.rb

@@ -1,3 +1,3 @@
 module AssertMoar
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/lib/assert_moar/assertions_test.rb

@@ -0,0 +1,48 @@
+require_relative '../../test_helper'
+
+class AssertMoar::AssertionTest < Minitest::Test
+  def setup
+    super
+
+    Minitest::Test.reset
+
+    @tc = Minitest::Test.new('foo')
+    @tc.send(:extend, AssertMoar::Assertions)
+    @assertion_count = 1
+  end
+
+  def test_assert_valid
+    @tc.assert_valid ActiveRecordDouble.new(valid: true)
+  end
+
+  def test_refute_valid
+    @tc.refute_valid ActiveRecordDouble.new(valid: false)
+  end
+
+  def test_assert_validates_presence_of
+    validator = ::ActiveModel::Validations::PresenceValidator
+    double = ActiveRecordDouble.new(error_map: { property: validator })
+    @tc.assert_validates_presence_of(double, :property)
+  end
+
+  def test_refute_validates_presence_of
+    double = ActiveRecordDouble.new()
+    @tc.refute_validates_presence_of(double, :property)
+  end
+
+  def test_assert_uniqueness_of
+    validator = ::ActiveRecord::Validations::UniquenessValidator
+    double = ActiveRecordDouble.new(error_map: { property: validator })
+    @tc.assert_validates_uniqueness_of(double, :property)
+  end
+
+  def test_refute_uniqueness_of
+    double = ActiveRecordDouble.new()
+    @tc.refute_validates_uniqueness_of(double, :property)
+  end
+
+  def teardown
+    assert_equal(@assertion_count, @tc.assertions,
+                 "expected #{@assertion_count} assertions to be fired during the test, not #{@tc.assertions}") if @tc.passed?
+  end
+end

data/test/support/active_model/validations.rb

@@ -0,0 +1,5 @@
+module ActiveModel
+  module Validations
+    class PresenceValidator; end
+  end
+end

data/test/support/active_record/validations.rb

@@ -0,0 +1,5 @@
+module ActiveRecord
+  module Validations
+    class UniquenessValidator; end
+  end
+end

data/test/test_helper.rb

@@ -7,28 +7,23 @@ Coveralls.wear!
 
 require 'minitest/autorun'
 require 'mocha/mini_test'
-require_relative '../lib/minitest/assertions'
 require_relative '../lib/assert_moar'
+require_relative 'support/active_model/validations'
+require_relative 'support/active_record/validations'
 
-class ActiveRecordSpy
-  attr_accessor :errors, :property, :property_file_name
+class ActiveRecordDouble
+  attr_accessor :valid, :error_map
 
-  def initialize(assert_valid = nil)
-    @errors = {}
-    @assert_valid = assert_valid
+  def self._validators
+    @@error_map.inject({}) { |hash, (k, v)| hash.merge(k => Array(v.new)) }
   end
 
-  def valid?
-    apply_errors
-    @errors.empty?
+  def initialize(valid: false, error_map: {})
+    @valid = valid
+    @@error_map = error_map.to_h
   end
 
-  private
-  def apply_errors
-    if !@assert_valid.nil? && self.send(@assert_valid).nil?
-      @errors[:property] = String.new
-    else
-      @errors.delete(:property)
-    end
+  def valid?
+    @valid == true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assert-moar
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - John Bohn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extra assertions for minitest
 email:
 - jjbohn@gmail.com
@@ -180,10 +194,12 @@ files:
 - Rakefile
 - assert-moar.gemspec
 - lib/assert_moar.rb
+- lib/assert_moar/assertions.rb
 - lib/assert_moar/version.rb
-- lib/minitest/assertions.rb
+- test/lib/assert_moar/assertions_test.rb
 - test/lib/assert_moar/version_test.rb
-- test/lib/minitest/assertions_test.rb
+- test/support/active_model/validations.rb
+- test/support/active_record/validations.rb
 - test/test_helper.rb
 homepage: https://github.com/jjbohn/assert-moar
 licenses:
@@ -210,6 +226,8 @@ signing_key:
 specification_version: 4
 summary: Extra assertions for minitest
 test_files:
+- test/lib/assert_moar/assertions_test.rb
 - test/lib/assert_moar/version_test.rb
-- test/lib/minitest/assertions_test.rb
+- test/support/active_model/validations.rb
+- test/support/active_record/validations.rb
 - test/test_helper.rb

data/lib/minitest/assertions.rb

@@ -1,59 +0,0 @@
-module MiniTest::Assertions
-  def assert_validates_presence_of(object, property)
-    assert_valid object
-    tmp = object.send("#{property}")
-    object.send("#{property}=", nil)
-    refute_valid object
-    refute_nil object.errors[property.to_sym], "Expected errors to exist for #{property}"
-    object.send("#{property}=", tmp)
-  end
-
-  def refute_validates_presence_of(object, property)
-    assert_valid object
-    tmp = object.send("#{property}")
-    object.send("#{property}=", nil)
-    assert_valid object
-    assert_nil object.errors[property.to_sym]
-    object.send("#{property}=", tmp)
-  end
-
-  def assert_validates_attachment_presence_of(object, property)
-    assert_valid object
-    tmp = object.send("#{property}_file_name")
-    object.send("#{property}_file_name=", nil)
-    refute_valid object
-    refute_nil object.errors[property.to_sym], "Expected errors to exist for #{property}"
-    object.send("#{property}_file_name=", tmp)
-  end
-
-  def refute_validates_attachment_presence_of(object, property)
-    assert_valid object
-    tmp = object.send("#{property}_file_name")
-    object.send("#{property}_file_name=", nil)
-    assert_valid object
-    assert_nil object.errors[property.to_sym]
-    object.send("#{property}_file_name=", tmp)
-  end
-
-  def assert_validates_uniqueness_of(object, property)
-    assert_valid object
-    object2 = object.clone
-    refute object2.valid?, "Expected object not to be valid"
-    refute_nil object2.errors[property.to_sym], "Expected errors to exist for #{property}"
-  end
-
-  def refute_validates_uniqueness_of(object, property)
-    assert_valid object
-    object2 = object.clone
-    assert_valid object2
-    assert_nil object2.errors[property.to_sym]
-  end
-
-  def assert_valid(object)
-    assert object.valid?, "Expected object to be valid"
-  end
-
-  def refute_valid object
-    refute object.valid?, "Expected object to not be valid"
-  end
-end

data/test/lib/minitest/assertions_test.rb

@@ -1,79 +0,0 @@
-require_relative '../../test_helper'
-
-class Minitest::AssertionTest < Minitest::Test
-  def setup
-    super
-
-    Minitest::Test.reset
-
-    @tc = Minitest::Test.new('foo')
-    @assertion_count = 1
-  end
-
-  def invalid_clone(object)
-    clone = object.class.new(:property)
-    clone.property = nil
-    clone
-  end
-
-  def test_assert_valid
-    double = spy
-    double.property = "foo"
-    @tc.assert_valid double
-  end
-
-  def test_refute_valid
-    @tc.refute_valid spy(:property)
-  end
-
-  def test_assert_validates_presence_of
-    @assertion_count = 3
-    double = spy(:property)
-    double.property = "foo"
-    @tc.assert_validates_presence_of(double, :property)
-    assert_equal "foo", double.property
-  end
-
-  def test_refute_validates_presence_of
-    @assertion_count = 3
-    @tc.refute_validates_presence_of(spy, :property)
-  end
-
-  def test_assert_validates_attachment_presence_of
-    @assertion_count = 3
-    double = spy(:property_file_name)
-    double.property_file_name = "foo.png"
-    @tc.assert_validates_attachment_presence_of(double, :property)
-  end
-
-  def test_refute_validates_attachment_presence_of
-    @assertion_count = 3
-    @tc.refute_validates_attachment_presence_of(spy, :property)
-  end
-
-  def test_assert_uniqueness_of
-    @assertion_count = 3
-    double = spy
-    double.property = "foo"
-    double.stub(:clone, invalid_clone(double)) do
-      @tc.assert_validates_uniqueness_of(double, :property)
-    end
-    assert_equal "foo", double.property
-  end
-
-  def test_refute_uniqueness_of
-    @assertion_count = 3
-    @tc.refute_validates_uniqueness_of(spy(nil), :property)
-  end
-
-  def teardown
-    assert_equal(@assertion_count, @tc.assertions,
-                 "expected #{@assertion_count} assertions to be fired during the test, not #{@tc.assertions}") if @tc.passed?
-  end
-
-  private
-
-  def spy(assert_valid = nil)
-    ActiveRecordSpy.new(assert_valid)
-  end
-end