rspec-its 1.3.1 → 2.0.0

data/lib/rspec/its/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module RSpec
   module Its
-    VERSION = "1.3.1"
+    VERSION = '2.0.0'
   end
 end

data/lib/rspec/its.rb

@@ -1,26 +1,29 @@
+# frozen_string_literal: true
+
+require 'rspec/its/subject'
 require 'rspec/its/version'
 require 'rspec/core'
 
 RSpec::Core::ExampleGroup.define_example_method :__its_example
 
 module RSpec
+  # Adds the `its` to RSpec Example Groups, included by default.
   module Its
-
     # Creates a nested example group named by the submitted `attribute`,
     # and then generates an example using the submitted block.
     #
     # @example
     #
     #   # This ...
-    #   describe Array do
-    #     its(:size) { should eq(0) }
+    #   RSpec.describe Array do
+    #     its(:size) { is_expected.to eq(0) }
     #   end
     #
     #   # ... generates the same runtime structure as this:
-    #   describe Array do
+    #   RSpec.describe Array do
     #     describe "size" do
-    #       it "should eq(0)" do
-    #         subject.size.should eq(0)
+    #       it "is_expected.to eq(0)" do
+    #         expect(subject.size).to eq(0)
     #       end
     #     end
     #   end
@@ -31,14 +34,14 @@ module RSpec
     #
     # @example
     #
-    #   describe Person do
-    #     subject do
+    #   RSpec.describe Person do
+    #     subject(:person) do
     #       Person.new.tap do |person|
     #         person.phone_numbers << "555-1212"
     #       end
     #     end
     #
-    #     its("phone_numbers.first") { should eq("555-1212") }
+    #     its("phone_numbers.first") { is_expected.to eq("555-1212") }
     #   end
     #
     # When the subject is a `Hash`, you can refer to the Hash keys by
@@ -46,30 +49,30 @@ module RSpec
     #
     # @example
     #
-    #   describe "a configuration Hash" do
+    #   RSpec.describe "a configuration Hash" do
     #     subject do
     #       { :max_users => 3,
     #         'admin' => :all_permissions.
     #         'john_doe' => {:permissions => [:read, :write]}}
     #     end
     #
-    #     its([:max_users]) { should eq(3) }
-    #     its(['admin']) { should eq(:all_permissions) }
-    #     its(['john_doe', :permissions]) { should eq([:read, :write]) }
+    #     its([:max_users]) { is_expected.to eq(3) }
+    #     its(['admin']) { is_expected.to eq(:all_permissions) }
+    #     its(['john_doe', :permissions]) { are_expected.to eq([:read, :write]) }
     #
     #     # You can still access its regular methods this way:
-    #     its(:keys) { should include(:max_users) }
-    #     its(:count) { should eq(2) }
+    #     its(:keys) { is_expected.to include(:max_users) }
+    #     its(:count) { is_expected.to eq(2) }
     #   end
     #
-    # With an implicit subject, `is_expected` can be used as an alternative
-    # to `should` (e.g. for one-liner use). An `are_expected` alias is also
+    # With an implicit subject, `should` can be used as an alternative
+    # to `is_expected` (e.g. for one-liner use). An `are_expected` alias is also
     # supplied.
     #
     # @example
     #
-    #   describe Array do
-    #     its(:size) { is_expected.to eq(0) }
+    #   RSpec.describe Array do
+    #     its(:size) { should eq(0) }
     #   end
     #
     # With an implicit subject, `will` can be used as an alternative
@@ -77,7 +80,7 @@ module RSpec
     #
     # @example
     #
-    #   describe Array do
+    #   RSpec.describe Array do
     #     its(:foo) { will raise_error(NoMethodError) }
     #   end
     #
@@ -86,7 +89,7 @@ module RSpec
     #
     # @example
     #
-    #   describe Array do
+    #   RSpec.describe Array do
     #     its(:size) { will_not raise_error }
     #   end
     #
@@ -96,15 +99,15 @@ module RSpec
     # @example
     #
     #   # This ...
-    #   describe Array do
-    #     its(:size, :focus) { should eq(0) }
+    #   RSpec.describe Array do
+    #     its(:size, :focus) { is_expected.to eq(0) }
     #   end
     #
     #   # ... generates the same runtime structure as this:
-    #   describe Array do
+    #   RSpec.describe Array do
     #     describe "size" do
-    #       it "should eq(0)", :focus do
-    #         subject.size.should eq(0)
+    #       it "is expected to eq(0)", :focus do
+    #         expect(subject.size).to eq(0)
     #       end
     #     end
     #   end
@@ -115,70 +118,56 @@ module RSpec
     #
     # @example
     #
-    #   describe Person do
+    #   RSpec.describe Person do
     #     subject { Person.new }
+    #
     #     before { subject.age = 25 }
-    #     its(:age) { should eq(25) }
+    #
+    #     its(:age) { is_expected.to eq(25) }
     #   end
     def its(attribute, *options, &block)
-      its_caller = caller.select {|file_line| file_line !~ %r(/lib/rspec/its) }
-      describe(attribute.to_s, :caller => its_caller) do
-        let(:__its_subject) do
-          if Array === attribute
-            if Hash === subject
-              attribute.inject(subject) {|inner, attr| inner[attr] }
-            else
-              subject[*attribute]
-            end
-          else
-            attribute_chain = attribute.to_s.split('.')
-            attribute_chain.inject(subject) do |inner_subject, attr|
-              inner_subject.send(attr)
-            end
-          end
-        end
+      its_caller = caller.grep_v(%r{/lib/rspec/its})
+
+      describe(attribute.to_s, caller: its_caller) do
+        let(:__its_subject) { RSpec::Its::Subject.for(attribute, subject) }
 
         def is_expected
           expect(__its_subject)
         end
         alias_method :are_expected, :is_expected
 
-        def will(matcher=nil, message=nil)
-          unless matcher.supports_block_expectations?
-            raise ArgumentError, "`will` only supports block expectations"
-          end
+        def will(matcher = nil, message = nil)
+          raise ArgumentError, "`will` only supports block expectations" unless matcher.supports_block_expectations?
+
           expect { __its_subject }.to matcher, message
         end
 
-        def will_not(matcher=nil, message=nil)
-          unless matcher.supports_block_expectations?
-            raise ArgumentError, "`will_not` only supports block expectations"
-          end
+        def will_not(matcher = nil, message = nil)
+          raise ArgumentError, "`will_not` only supports block expectations" unless matcher.supports_block_expectations?
+
           expect { __its_subject }.to_not matcher, message
         end
 
-        def should(matcher=nil, message=nil)
+        def should(matcher = nil, message = nil)
           RSpec::Expectations::PositiveExpectationHandler.handle_matcher(__its_subject, matcher, message)
         end
 
-        def should_not(matcher=nil, message=nil)
+        def should_not(matcher = nil, message = nil)
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(__its_subject, matcher, message)
         end
 
-        options << {} unless options.last.kind_of?(Hash)
-        options.last.merge!(:caller => its_caller)
+        options << {} unless options.last.is_a?(Hash)
+        options.last.merge!(caller: its_caller)
 
         __its_example(nil, *options, &block)
-
       end
     end
-
   end
 end
 
 RSpec.configure do |rspec|
   rspec.extend RSpec::Its
-  rspec.backtrace_exclusion_patterns << %r(/lib/rspec/its)
+  rspec.backtrace_exclusion_patterns << %r{/lib/rspec/its}
 end
 
 RSpec::SharedContext.send(:include, RSpec::Its)

data/rspec-its.gemspec

@@ -1,49 +1,31 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rspec/its/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rspec-its"
   spec.version       = RSpec::Its::VERSION
-  spec.authors       = ["Peter Alfvin"]
-  spec.email         = ["palfvin@gmail.com"]
-  spec.description   = %q{RSpec extension gem for attribute matching}
-  spec.summary       = %q{Provides "its" method formerly part of rspec-core}
+  spec.authors       = ["The RSpec Development Team"]
+  spec.email         = ["maintainers@rspec.info"]
+  spec.description   = 'RSpec extension gem for attribute matching'
+  spec.summary       = 'Provides "its" method formerly part of rspec-core'
   spec.homepage      = "https://github.com/rspec/rspec-its"
   spec.license       = "MIT"
+  spec.required_ruby_version = '> 3.0.0'
 
-  spec.metadata = {
-    'bug_tracker_uri'   => 'https://github.com/rspec/rspec-its/issues',
-    'changelog_uri'     => "https://github.com/rspec/rspec-its/blob/v#{spec.version}/Changelog.md",
-    'documentation_uri' => "https://www.rubydoc.info/gems/rspec-its/#{spec.version}",
-    'mailing_list_uri'  => 'https://groups.google.com/forum/#!forum/rspec',
-    'source_code_uri'   => 'https://github.com/rspec/rspec-its',
-  }
+  spec.metadata['bug_tracker_uri'] = 'https://github.com/rspec/rspec-its/issues'
+  spec.metadata['changelog_uri'] = "https://github.com/rspec/rspec-its/blob/v#{spec.version}/Changelog.md"
+  spec.metadata['documentation_uri'] = "https://www.rubydoc.info/gems/rspec-its/#{spec.version}"
+  spec.metadata['mailing_list_uri'] = 'https://groups.google.com/forum/#!forum/rspec'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata['source_code_uri'] = 'https://github.com/rspec/rspec-its'
 
   spec.files         = `git ls-files`.split($/) - %w[cucumber.yml]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rspec-core', '>= 3.0.0'
-  spec.add_runtime_dependency 'rspec-expectations', '>= 3.0.0'
-
-  if RUBY_VERSION.to_f < 1.9 || RUBY_VERSION == '1.9.2'
-    spec.add_development_dependency "rake",     "~> 10.0.0"
-  elsif RUBY_VERSION.to_f < 2
-    spec.add_development_dependency "rake",     "~> 11.0.0"
-  elsif RUBY_VERSION.to_f < 2.3
-    spec.add_development_dependency "rake",     "~> 12.3.2"
-  else
-    spec.add_development_dependency "rake",     "~> 13.0.0"
-  end
-
-  spec.add_development_dependency 'bundler',  '> 1.3.0'
-  if RUBY_VERSION.to_f < 2
-    spec.add_development_dependency 'cucumber', '< 3.0.0'
-  else
-    spec.add_development_dependency 'cucumber', '>= 1.3.8'
-  end
-  spec.add_development_dependency "aruba",    "~> 0.14.12"
+  spec.add_dependency 'rspec-core', '>= 3.13.0'
+  spec.add_dependency 'rspec-expectations', '>= 3.13.0'
 end

data/script/test_all

@@ -21,16 +21,14 @@ else
   echo "Using $BRANCH"
 fi
 
-if ruby -e 'exit(ENV.fetch("BRANCH") =~ /3-[0-8]-maintenance/ ? 0 : 1)'; then
-  TAGS="--tags @pre-3-9"
-else
-  TAGS="--tags @post-3-9"
-fi;
-
 if ruby -e "exit(defined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java')"; then
   # This is JRUBY which requires this one weird path trick...
   PATH="${PWD}/bin:$PATH" \
-  bundle exec cucumber --strict $TAGS
+  bundle exec cucumber --strict
+elif ruby -e "exit(RUBY_VERSION.to_f >= 3.4)"; then
+  # This is a monkey patch to fix an issue with cucumber using outdated hash syntax, remove when cucumber is updated or ruby 3.4 released
+  sed -i '$i\class Hash; alias :__initialize :initialize; def initialize(*args, **_kw, &block) = __initialize(*args, &block); end' bin/cucumber
+  bin/cucumber --strict
 else
-  bundle exec cucumber --strict $TAGS
+  bundle exec cucumber --strict
 fi;

data/script/update_rubygems_and_install_bundler

@@ -1,35 +1,7 @@
 #!/bin/bash
-# This file was generated on 2019-01-03T20:34:23+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e
 
-function is_ruby_31_plus {
-  if ruby -e "exit(RUBY_VERSION.to_f >= 3.1)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function is_ruby_23_plus {
-  if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-if is_ruby_31_plus; then
-  echo "Installing rubygems 3.3.6 / bundler 2.3.6"
-  yes | gem update --system '3.3.6'
-  yes | gem install bundler -v '2.3.6'
-elif is_ruby_23_plus; then
-  echo "Installing rubygems 3.2.22 / bundler 2.2.22"
-  yes | gem update --system '3.2.22'
-  yes | gem install bundler -v '2.2.22'
-else
-  echo "Warning installing older versions of Rubygems / Bundler"
-  gem update --system '2.7.8'
-  gem install bundler -v '1.17.3'
-fi
+echo "Installing latest rubygems / bundler"
+yes | gem update --system
+yes | gem install bundler