assert-moar 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcc1728ac901b97cddff74e59b689e5618f7c26e
-  data.tar.gz: 2b72423b1105203607a90bbde92c6c53d501d3d0
+  metadata.gz: 1c127ad0f44d56ae95f5a6be9b7cab84235dad3b
+  data.tar.gz: ba1bb17eb3cdb23907a75393b1f058bb426e6a3c
 SHA512:
-  metadata.gz: e1b90e1f8d9cf8543e3610071650b4f96ae9b325896666e1605ab4e6b752f85ddb186e2fc21f32d948d2edc29222cf6e5da76519935e4a0693451a2b1af38f96
-  data.tar.gz: f55cfd7da6a40088247728048a45627f402235869a01b78eab2b157b88ef2e2c48d0aea37f0e8536a1db88e45e0474103ffc53d98ccb7d1041ae16412195205c
+  metadata.gz: 8993578106bcc32c2d27afe488d601a76924444dc95ba14e017d073d589bad9882be542d813dc13d42aa42f6662d9b88a5ff30804d6de8f6cff72cce12de403d
+  data.tar.gz: d09a311ba5283bebf24fab23f09a7fc806cdd5cb0f9977ca0835a01955be193614a5c4d3207dfa8abdacd7cca78a52419065d9f9408d7b97e345e90ae748390a

data/lib/assert_moar/version.rb

@@ -1,3 +1,3 @@
 module AssertMoar
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/minitest/assertions.rb

@@ -1,27 +1,45 @@
 module MiniTest::Assertions
   def assert_validates_presence_of(object, property)
-    assert_valid(object)
+    assert_valid object
     tmp = object.send("#{property}")
     object.send("#{property}=", nil)
-    refute object.valid?, "Expected object not to be valid"
-    assert object.errors[property.to_sym], "Expected errors to exist for #{property}"
+    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)
+    assert_valid object
     tmp = object.send("#{property}")
     object.send("#{property}=", nil)
-    assert_valid(object)
+    assert_valid object
     assert_nil object.errors[property.to_sym]
     object.send("#{property}=", tmp)
   end
 
-  def assert_valid(object)
+  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_valid object
     assert object.valid?, "Expected object to be valid"
   end
 
-  def refute_valid(object)
+  def refute_valid object
     refute object.valid?, "Expected object to not be valid"
   end
 end

data/test/lib/minitest/assertions_test.rb

@@ -11,18 +11,18 @@ class Minitest::AssertionTest < Minitest::Test
   end
 
   def test_assert_valid
-    double = ActiveRecordBaseDouble.new
+    double = spy
     double.property = "foo"
     @tc.assert_valid double
   end
 
   def test_refute_valid
-    @tc.refute_valid ActiveRecordBaseDouble.new
+    @tc.refute_valid spy(:property)
   end
 
   def test_assert_validates_presence_of
     @assertion_count = 3
-    double = ActiveRecordBaseDouble.new
+    double = spy(:property)
     double.property = "foo"
     @tc.assert_validates_presence_of(double, :property)
     assert_equal "foo", double.property
@@ -30,11 +30,29 @@ class Minitest::AssertionTest < Minitest::Test
 
   def test_refute_validates_presence_of
     @assertion_count = 3
-    @tc.refute_validates_presence_of(ActiveRecordBaseDouble.new(false), :property)
+    @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 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

data/test/test_helper.rb

@@ -10,24 +10,25 @@ require 'mocha/mini_test'
 require_relative '../lib/minitest/assertions'
 require_relative '../lib/assert_moar'
 
-class ActiveRecordBaseDouble
-  attr_accessor :errors, :property
+class ActiveRecordSpy
+  attr_accessor :errors, :property, :property_file_name
 
-  def initialize(assert_valid = true)
+  def initialize(assert_valid = nil)
     @errors = {}
     @assert_valid = assert_valid
   end
 
-  def property=(value)
-    @property = value
-    @errors[:property] = value.nil? ? String.new : nil if asserts_valid?
-  end
-
   def valid?
-    !@property.nil? || !asserts_valid?
+    apply_errors
+    @errors.empty?
   end
 
-  def asserts_valid?
-    @assert_valid == true
+  private
+  def apply_errors
+    if !@assert_valid.nil? && self.send(@assert_valid).nil?
+      @errors[:property] = String.new
+    else
+      @errors.delete(:property)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assert-moar
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Bohn