minitest-mock_expectations 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f39433eab710b34b5fab6078b743f1a345a0a242c2f3a31d3d8ea4564609c3
-  data.tar.gz: 3a06f63076588965aa9a3ea2b0ceac73015dd3dacb6478d390efc09bd8ef846f
+  metadata.gz: 2adcab05aae81e343becab28c6f8c3181f92d81294de224656ea678cf96004d5
+  data.tar.gz: 2fe148fee3686d80e0509a5711f523aa5b407b7fd929e4719fef734972943a4a
 SHA512:
-  metadata.gz: 1e7bfc343ab7fa29ec34c0bdcd90299dfd7113cf740fe0d937fe41f5217064b787607ae9c09da8134996cd36c398a839611381eef7a09dab5f5b83caad9057a3
-  data.tar.gz: b54791b53a5b9c396445662c30a335131a22dd539da0724ab501a6a0bd398f5cd99b69a4489adbdac42b10869b846c0663f946a75e27080ceb6c0f927aacf1d3
+  metadata.gz: 236932920587374d39cc3837c54db5a9bb5464c86c45375152975cf95f72b6e7128ca6ec4617a682952b1f27360e545b7b22a18c524d2fa14dbdddcdcbc3c1d8
+  data.tar.gz: 3ef5fcf49a4b74aa1eb5f0d3427e37bad70a12c80591f79661291c9df3517eda76689732b327c0024930a2adb13f7067e0afadfdbcb1833eb84582851fdd2e31

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5.x, 2.6.x, 2.7.x]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies
+        run: |
+          gem install bundler
+          bundle install
+      - name: Run tests
+        run: bundle exec rake test

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.1.2 / Aprir 24, 2020
+
+* Fix `assert_called_with` with an array as expected argument.
+
+* Fix COPYRIGHT HOLDER of LICENSE.txt.
+
 ### 1.1.1 / February 26, 2019
 
 ### 1.1.0 / February 26, 2019

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    minitest-mock_expectations (1.1.1)
+    minitest-mock_expectations (1.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.11.3)
-    rake (10.5.0)
+    rake (12.3.3)
 
 PLATFORMS
   ruby
@@ -19,4 +19,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.0.1
+   2.1.2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 bogdanvlviv
+Copyright (c) 2018 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -136,6 +136,38 @@ assert_called_with(@post, :add_comment, [["Thanks for sharing this."], ["Thanks!
 end
 ```
 
+```ruby
+assert_called_with(@post, :add_comment, [["Thanks for sharing this."]]) do
+  @post.add_comment(["Thanks for sharing this."])
+end
+```
+
+```ruby
+assert_called_with(@post, :add_comment, [["Thanks for sharing this.", "Thanks!"]]) do
+  @post.add_comment(["Thanks for sharing this.", "Thanks!"])
+end
+```
+
+```ruby
+assert_called_with(@post, :add_comment, [["Thanks for sharing this."], {body: "Thanks!"}]) do
+  @post.add_comment(["Thanks for sharing this."], {body: "Thanks!"})
+end
+```
+
+```ruby
+assert_called_with(@post, :add_comment, [[["Thanks for sharing this."]], [{body: "Thanks!"}]]) do
+  @post.add_comment(["Thanks for sharing this."])
+  @post.add_comment({body: "Thanks!"})
+end
+```
+
+```ruby
+assert_called_with(@post, :add_comment, [[["Thanks for sharing this."]], [["Thanks!"]]]) do
+  @post.add_comment(["Thanks for sharing this."])
+  @post.add_comment(["Thanks!"])
+end
+```
+
 ### assert_called_on_instance_of(klass, method_name, message = nil, times: 1, returns: nil)
 
 Asserts that the method will be called on an instance of the `klass` in the block

data/lib/minitest/mock_expectations/assertions.rb

@@ -98,10 +98,33 @@ module Minitest
     #     @post.add_comment("Thanks for sharing this.")
     #     @post.add_comment("Thanks!")
     #   end
+    #
+    #   assert_called_with(@post, :add_comment, [["Thanks for sharing this."]]) do
+    #     @post.add_comment(["Thanks for sharing this."])
+    #   end
+    #
+    #   assert_called_with(@post, :add_comment, [["Thanks for sharing this.", "Thanks!"]]) do
+    #     @post.add_comment(["Thanks for sharing this.", "Thanks!"])
+    #   end
+    #
+    #   assert_called_with(@post, :add_comment, [["Thanks for sharing this."], {body: "Thanks!"}]) do
+    #     @post.add_comment(["Thanks for sharing this."], {body: "Thanks!"})
+    #   end
+    #
+    #   assert_called_with(@post, :add_comment, [[["Thanks for sharing this."]], [{body: "Thanks!"}]]) do
+    #     @post.add_comment(["Thanks for sharing this."])
+    #     @post.add_comment({body: "Thanks!"})
+    #   end
+    #
+    #   assert_called_with(@post, :add_comment, [[["Thanks for sharing this."]], [["Thanks!"]]]) do
+    #     @post.add_comment(["Thanks for sharing this."])
+    #     @post.add_comment(["Thanks!"])
+    #   end
+    #
     def assert_called_with(object, method_name, arguments, returns: nil)
       mock = Minitest::Mock.new
 
-      if arguments.all? { |argument| argument.is_a?(Array) }
+      if arguments.size > 1 && arguments.all? { |argument| argument.is_a?(Array) }
         arguments.each { |argument| mock.expect(:call, returns, argument) }
       else
         mock.expect(:call, returns, arguments)

data/lib/minitest/mock_expectations/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module MockExpectations
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/test/minitest/mock_expectations/assertions_test.rb

@@ -56,7 +56,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     assert_equal "What is new in Rails 6.0", @post.title
   end
 
-  def test_assert_called_failure
+  def test_assert_called_failure_because_method_has_not_been_called
     error = assert_raises(Minitest::Assertion) do
       assert_called(@post, :title) do
         @post.body
@@ -66,7 +66,18 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     assert_equal "Expected title to be called 1 times, but was called 0 times.\nExpected: 1\n  Actual: 0", error.message
   end
 
-  def test_assert_called_with_message
+  def test_assert_called_failure_because_method_has_been_called_more_than_expected_times
+    error = assert_raises(Minitest::Assertion) do
+      assert_called(@post, :title) do
+        @post.title
+        @post.title
+      end
+    end
+
+    assert_equal "Expected title to be called 1 times, but was called 2 times.\nExpected: 1\n  Actual: 2", error.message
+  end
+
+  def test_assert_called_failure_with_message
     error = assert_raises(Minitest::Assertion) do
       assert_called(@post, :title, "Message") do
         @post.body
@@ -82,7 +93,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     end
   end
 
-  def test_refute_called_failure
+  def test_refute_called_failure_because_method_has_been_called
     error = assert_raises(Minitest::Assertion) do
       refute_called(@post, :add_comment) do
         @post.add_comment("Thanks for sharing this.")
@@ -92,7 +103,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     assert_equal "Expected add_comment to be called 0 times, but was called 1 times.\nExpected: 0\n  Actual: 1", error.message
   end
 
-  def test_refute_called_with_message
+  def test_refute_called_failure_with_message
     error = assert_raises(Minitest::Assertion) do
       refute_called(@post, :title, "Message") do
         @post.title
@@ -120,7 +131,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     assert_equal "Thank you!", @post.add_comment("Thanks for sharing this.")
   end
 
-  def test_assert_called_with_failure
+  def test_assert_called_with_failure_because_method_has_not_been_called_with_expected_arguments
     assert_raises(MockExpectationError) do
       assert_called_with(@post, :add_comment, ["Thanks for sharing this."]) do
         @post.add_comment("Thanks")
@@ -135,6 +146,36 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     end
   end
 
+  def test_assert_called_with_an_array_as_expected_argument
+    assert_called_with(@post, :add_comment, [["Thanks for sharing this."]]) do
+      @post.add_comment(["Thanks for sharing this."])
+    end
+
+    assert_called_with(@post, :add_comment, [["Thanks for sharing this.", "Thanks!"]]) do
+      @post.add_comment(["Thanks for sharing this.", "Thanks!"])
+    end
+  end
+
+  def test_assert_called_with_multiple_expected_arguments_as_arrays
+    assert_called_with(@post, :add_comment, [[["Thanks for sharing this."]], [["Thanks!"]]]) do
+      @post.add_comment(["Thanks for sharing this."])
+      @post.add_comment(["Thanks!"])
+    end
+  end
+
+  def test_assert_called_with_expected_arguments_as_array_and_one_non_array_object
+    assert_called_with(@post, :add_comment, [["Thanks for sharing this."], {body: "Thanks!"}]) do
+      @post.add_comment(["Thanks for sharing this."], {body: "Thanks!"})
+    end
+  end
+
+  def test_assert_called_with_multiple_expected_arguments_as_array_and_one_non_array_object
+    assert_called_with(@post, :add_comment, [[["Thanks for sharing this."]], [{body: "Thanks!"}]]) do
+      @post.add_comment(["Thanks for sharing this."])
+      @post.add_comment({body: "Thanks!"})
+    end
+  end
+
   def test_assert_called_on_instance_of_with_defaults_to_expect_once
     assert_called_on_instance_of(Post, :title) do
       @post.title
@@ -162,7 +203,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     assert_equal "What is new in Rails 6.0", @post.title
   end
 
-  def test_assert_called_on_instance_of_failure
+  def test_assert_called_on_instance_of_failure_because_method_has_not_been_called
     error = assert_raises(Minitest::Assertion) do
       assert_called_on_instance_of(Post, :title) do
         @post.body
@@ -172,7 +213,18 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     assert_equal "Expected title to be called 1 times, but was called 0 times.\nExpected: 1\n  Actual: 0", error.message
   end
 
-  def test_assert_called_on_instance_of_with_message
+  def test_assert_called_on_instance_of_failure_because_method_has_been_called_more_than_expected_times
+    error = assert_raises(Minitest::Assertion) do
+      assert_called_on_instance_of(Post, :title) do
+        @post.title
+        @post.title
+      end
+    end
+
+    assert_equal "Expected title to be called 1 times, but was called 2 times.\nExpected: 1\n  Actual: 2", error.message
+  end
+
+  def test_assert_called_on_instance_of_failure_with_message
     error = assert_raises(Minitest::Assertion) do
       assert_called_on_instance_of(Post, :title, "Message") do
         @post.body
@@ -200,7 +252,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     end
   end
 
-  def test_refute_called_on_instance_of_failure
+  def test_refute_called_on_instance_of_failure_because_method_has_been_called
     error = assert_raises(Minitest::Assertion) do
       refute_called_on_instance_of(Post, :add_comment) do
         @post.add_comment("Thanks for sharing this.")
@@ -210,7 +262,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     assert_equal "Expected add_comment to be called 0 times, but was called 1 times.\nExpected: 0\n  Actual: 1", error.message
   end
 
-  def test_refute_called_on_instance_of_with_message
+  def test_refute_called_on_instance_of_failure_with_message
     error = assert_raises(Minitest::Assertion) do
       refute_called_on_instance_of(Post, :title, "Message") do
         @post.title
@@ -228,7 +280,7 @@ class Minitest::MockExpectations::AssertionsTest < Minitest::Test
     end
   end
 
-  def test_assert_called_on_instance_of_is_alias_for_refute_called
+  def test_assert_not_called_on_instance_of_is_alias_for_refute_called
     assert method(:assert_not_called_on_instance_of).eql?(method(:refute_called_on_instance_of))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-mock_expectations
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - bogdanvlviv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".travis.yml"
+- ".github/workflows/ci.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provides method call assertions for minitest

data/.travis.yml

@@ -1,11 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.3
-  - 2.6.1
-  - ruby-head
-before_install: gem install bundler
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head