mocha 1.4.0 → 1.7.0

data/test/unit/parameter_matchers/responds_with_test.rb

@@ -5,7 +5,6 @@ require 'mocha/parameter_matchers/object'
 require 'mocha/inspect'
 
 class RespondsWithTest < Mocha::TestCase
-
   include Mocha::ParameterMatchers
 
   def test_should_match_parameter_responding_with_expected_value
@@ -20,7 +19,15 @@ class RespondsWithTest < Mocha::TestCase
 
   def test_should_match_parameter_responding_with_nested_responds_with_matcher
     matcher = responds_with(:foo, responds_with(:bar, 'baz'))
-    object = Class.new { def foo; Class.new { def bar; 'baz'; end }.new; end }.new
+    object = Class.new do
+      def foo
+        Class.new do
+          def bar
+            'baz'
+          end
+        end.new
+      end
+    end.new
     assert matcher.matches?([object])
   end
 
@@ -28,5 +35,4 @@ class RespondsWithTest < Mocha::TestCase
     matcher = responds_with(:foo, :bar)
     assert_equal 'responds_with(:foo, :bar)', matcher.mocha_inspect
   end
-
 end

data/test/unit/parameter_matchers/stub_matcher.rb

@@ -1,7 +1,5 @@
 module Stub
-
   class Matcher
-
     attr_accessor :value
 
     def initialize(matches)
@@ -21,7 +19,5 @@ module Stub
     def to_matcher
       self
     end
-
   end
-
 end

data/test/unit/parameter_matchers/yaml_equivalent_test.rb

@@ -4,7 +4,6 @@ require 'mocha/parameter_matchers/yaml_equivalent'
 require 'mocha/inspect'
 
 class YamlEquivalentTest < Mocha::TestCase
-
   include Mocha::ParameterMatchers
 
   def test_should_match_parameter_matching_yaml_representation_of_object
@@ -19,7 +18,6 @@ class YamlEquivalentTest < Mocha::TestCase
 
   def test_should_describe_matcher
     matcher = yaml_equivalent([1, 2, 3])
-    assert_equal "yaml_equivalent([1, 2, 3])", matcher.mocha_inspect
+    assert_equal 'yaml_equivalent([1, 2, 3])', matcher.mocha_inspect
   end
-
 end

data/test/unit/parameters_matcher_test.rb

@@ -2,7 +2,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/parameters_matcher'
 
 class ParametersMatcherTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_match_any_actual_parameters_if_no_expected_parameters_specified
@@ -101,14 +100,14 @@ class ParametersMatcherTest < Mocha::TestCase
   end
 
   def test_should_remove_curly_braces_if_hash_is_only_argument
-    params = [{:a => 1, :z => 2}]
+    params = [{ :a => 1, :z => 2 }]
     parameters_matcher = ParametersMatcher.new(params)
     assert_nil parameters_matcher.mocha_inspect.index('{')
     assert_nil parameters_matcher.mocha_inspect.index('}')
   end
 
   def test_should_not_remove_curly_braces_if_hash_is_not_the_only_argument
-    params = [1, {:a => 1}]
+    params = [1, { :a => 1 }]
     parameters_matcher = ParametersMatcher.new(params)
     assert_equal '(1, {:a => 1})', parameters_matcher.mocha_inspect
   end
@@ -117,5 +116,4 @@ class ParametersMatcherTest < Mocha::TestCase
     parameters_matcher = ParametersMatcher.new
     assert_equal '(any_parameters)', parameters_matcher.mocha_inspect
   end
-
 end

data/test/unit/receivers_test.rb

@@ -4,13 +4,32 @@ require 'mocha/receivers'
 class ObjectReceiverTest < Mocha::TestCase
   include Mocha
 
-  class FakeObject < Struct.new(:mocha)
-    def is_a?(klass)
+  class FakeObject
+    def initialize(mocha)
+      @mocha = mocha
+    end
+
+    def mocha(_instantiate)
+      @mocha
+    end
+
+    def is_a?(_klass)
       false
     end
   end
 
-  class FakeClass < Struct.new(:superclass, :mocha)
+  class FakeClass
+    attr_reader :superclass
+
+    def initialize(superclass, mocha)
+      @superclass = superclass
+      @mocha = mocha
+    end
+
+    def mocha(_instantiate)
+      @mocha
+    end
+
     def is_a?(klass)
       klass == Class
     end
@@ -35,14 +54,25 @@ class AnyInstanceReceiverTest < Mocha::TestCase
   include Mocha
 
   class FakeAnyInstanceClass
+    class AnyInstance
+      def initialize(mocha)
+        @mocha = mocha
+      end
+
+      def mocha(_instantiate)
+        @mocha
+      end
+    end
+
     attr_reader :superclass
 
     def initialize(superclass, mocha)
-      @superclass, @mocha = superclass, mocha
+      @superclass = superclass
+      @mocha = mocha
     end
 
     def any_instance
-      Struct.new(:mocha).new(@mocha)
+      AnyInstance.new(@mocha)
     end
   end
 

data/test/unit/return_values_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/return_values'
 
 class ReturnValuesTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_return_nil
@@ -52,12 +51,11 @@ class ReturnValuesTest < Mocha::TestCase
   end
 
   def test_should_combine_two_sets_of_return_values
-    values_1 = ReturnValues.build('value_1')
-    values_2 = ReturnValues.build('value_2a', 'value_2b')
-    values = (values_1 + values_2).values
+    values1 = ReturnValues.build('value_1')
+    values2 = ReturnValues.build('value_2a', 'value_2b')
+    values = (values1 + values2).values
     assert_equal 'value_1', values[0].evaluate
     assert_equal 'value_2a', values[1].evaluate
     assert_equal 'value_2b', values[2].evaluate
   end
-
 end

data/test/unit/sequence_test.rb

@@ -3,11 +3,9 @@ require 'mocha/sequence'
 require 'mocha/expectation'
 
 class SequenceTest < Mocha::TestCase
-
   include Mocha
 
   class FakeExpectation
-
     attr_reader :ordering_constraints
 
     def initialize(satisfied = false)
@@ -22,7 +20,6 @@ class SequenceTest < Mocha::TestCase
     def satisfied?
       @satisfied
     end
-
   end
 
   def test_should_be_satisfied_if_no_expectations_added
@@ -98,7 +95,6 @@ class SequenceTest < Mocha::TestCase
     sequence = Sequence.new('wibble')
     expectation = FakeExpectation.new
     sequence.constrain_as_next_in_sequence(expectation)
-    assert_equal %{in sequence "wibble"}, expectation.ordering_constraints[0].mocha_inspect
+    assert_equal %(in sequence "wibble"), expectation.ordering_constraints[0].mocha_inspect
   end
-
 end

data/test/unit/single_return_value_test.rb

@@ -3,12 +3,10 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/single_return_value'
 
 class SingleReturnValueTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_return_value
     value = SingleReturnValue.new('value')
     assert_equal 'value', value.evaluate
   end
-
 end

data/test/unit/single_yield_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/single_yield'
 
 class SingleYieldTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_provide_parameters_for_single_yield_in_single_invocation
@@ -14,5 +13,4 @@ class SingleYieldTest < Mocha::TestCase
     end
     assert_equal [[1, 2, 3]], parameter_groups
   end
-
 end

data/test/unit/state_machine_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/state_machine'
 
 class StateMachineTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_initially_be_in_no_state
@@ -92,7 +91,6 @@ class StateMachineTest < Mocha::TestCase
   end
 
   def any_state
-    %w(A B C D)
+    %w[A B C D]
   end
-
 end

data/test/unit/string_inspect_test.rb

@@ -2,10 +2,8 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/inspect'
 
 class StringInspectTest < Mocha::TestCase
-
   def test_should_use_default_inspect_method
-    string = "my_string"
-    assert_equal %{"my_string"}, string.mocha_inspect
+    string = 'my_string'
+    assert_equal %("my_string"), string.mocha_inspect
   end
-
 end

data/test/unit/thrower_test.rb

@@ -3,7 +3,6 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'mocha/thrower'
 
 class ThrowerTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_throw_tag
@@ -16,5 +15,4 @@ class ThrowerTest < Mocha::TestCase
     return_value = catch(:tag) { thrower.evaluate }
     assert_equal 'return-value', return_value
   end
-
 end

data/test/unit/yield_parameters_test.rb

@@ -6,7 +6,6 @@ require 'mocha/single_yield'
 require 'mocha/multiple_yields'
 
 class YieldParametersTest < Mocha::TestCase
-
   include Mocha
 
   def test_should_return_null_yield_parameter_group_by_default
@@ -89,5 +88,4 @@ class YieldParametersTest < Mocha::TestCase
     assert parameter_group.is_a?(MultipleYields)
     assert_equal [[4, 5, 6], [7, 8]], parameter_group.parameter_groups
   end
-
 end

data/yard-templates/default/layout/html/setup.rb

@@ -1,6 +1,5 @@
 def init
   super
-  if ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
-    sections[:layout] << :google_analytics
-  end
+  return unless ENV['GOOGLE_ANALYTICS_WEB_PROPERTY_ID']
+  sections[:layout] << :google_analytics
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - James Mead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
@@ -102,6 +116,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gemtest"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".yardopts"
 - CONTRIBUTING.md
 - COPYING.md
@@ -141,6 +157,7 @@ files:
 - lib/mocha/deprecation.rb
 - lib/mocha/detection/mini_test.rb
 - lib/mocha/detection/test_unit.rb
+- lib/mocha/error_with_filtered_backtrace.rb
 - lib/mocha/exception_raiser.rb
 - lib/mocha/expectation.rb
 - lib/mocha/expectation_error.rb
@@ -187,6 +204,7 @@ files:
 - lib/mocha/multiple_yields.rb
 - lib/mocha/names.rb
 - lib/mocha/no_yields.rb
+- lib/mocha/not_initialized_error.rb
 - lib/mocha/object_methods.rb
 - lib/mocha/parameter_matchers.rb
 - lib/mocha/parameter_matchers/all_of.rb
@@ -250,6 +268,7 @@ files:
 - test/acceptance/parameter_matcher_test.rb
 - test/acceptance/partial_mocks_test.rb
 - test/acceptance/prepend_test.rb
+- test/acceptance/prevent_use_of_mocha_outside_test_test.rb
 - test/acceptance/raise_exception_test.rb
 - test/acceptance/return_value_test.rb
 - test/acceptance/sequence_test.rb
@@ -377,9 +396,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mocha
-rubygems_version: 2.6.11
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mocking and stubbing library
 test_files: []