1.2.0 release

- Fixes metadata passing problem - Update version number
rspec · Feb 6, 2015 · 83d0ff5 · 83d0ff5
1 parent 54c5088
commit 83d0ff5
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 16 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,14 @@
+### 1.2.0 / 2015-02-06
+[full changelog](http://github.com/rspec/rspec-its/compare/v1.1.0...v1.2.0)
+
+Breaking Changes:
+
+Enhancements:
+* Introduced `are_expected` as alias for `is_expected`
+
+Bug fixes:
+* Restored ability to pass key/value metadata parameters, broken by https://github.com/rspec/rspec-its/commit/71307bc7051f482bfc2798daa390bee9142b0d5a
+
 ### 1.1.0 / 2014-04-13
 [full changelog](http://github.com/rspec/rspec-its/compare/v1.0.1...v1.1.0)
 
@@ -22,17 +33,14 @@ Bug fixes:
 
 Breaking Changes:
 
-
 Enhancements:
 * Add `is_expected` support to match RSpec 3.0
 
 Deprecations:
 
-
 Bug Fixes:
 * Report failures and backtrace from client perspective
 
-
 ### 1.0.0.pre / 2013-10-11
 
 Features

diff --git a/features/its.feature b/features/its.feature
@@ -116,6 +116,9 @@ Feature: attribute of subject
         context "when first created" do
           its(:size) { should eq(0) }
         end
+        it "should never execute this" do
+          expect(true).to be(false)
+        end
       end
       """
     When I run rspec specifying line number 2

diff --git a/lib/rspec/its.rb b/lib/rspec/its.rb
@@ -130,7 +130,9 @@ def should_not(matcher=nil, message=nil)
           RSpec::Expectations::NegativeExpectationHandler.handle_matcher(__its_subject, matcher, message)
         end
 
-        options << { :caller => its_caller }
+        options << {} unless options.last.kind_of?(Hash)
+        options.last.merge!(:caller => its_caller)
+
         example(nil, *options, &block)
 
       end

diff --git a/lib/rspec/its/version.rb b/lib/rspec/its/version.rb
@@ -1,5 +1,5 @@
 module RSpec
   module Its
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end
diff --git a/spec/rspec/its_spec.rb b/spec/rspec/its_spec.rb
@@ -5,7 +5,7 @@ module RSpec
     describe "#its" do
       context "with implicit subject" do
         context "preserves described_class" do
-          its(:symbol) { expect(described_class).to be Its}
+          its(:symbol) { expect(described_class).to be Its }
           its([]) { expect(described_class).to be Its }
         end
       end
@@ -53,20 +53,20 @@ def name
               end
             end.new
           end
-          its("name")            { should eq("John") }
-          its("name.size")       { should eq(4) }
+          its("name") { should eq("John") }
+          its("name.size") { should eq(4) }
           its("name.size.class") { should eq(Fixnum) }
 
           context "using should_not" do
-            its("name")          { should_not eq("Paul") }
+            its("name") { should_not eq("Paul") }
           end
 
           context "using is_expected" do
-            its("name")          { is_expected.to eq("John") }
+            its("name") { is_expected.to eq("John") }
           end
 
           context "using are_expected" do
-            its("name.chars.to_a")    { are_expected.to eq(%w[J o h n]) }
+            its("name.chars.to_a") { are_expected.to eq(%w[J o h n]) }
           end
         end
 
@@ -133,7 +133,9 @@ def name
               its(:last) { should eq("a") }
 
               describe '.first' do
-                def subject; super().first; end
+                def subject;
+                  super().first;
+                end
 
                 its(:next) { should eq(2) }
               end
@@ -149,6 +151,7 @@ def subject; super().first; end
               def initialize
                 @counter = -1
               end
+
               def nil_if_first_time
                 @counter += 1
                 @counter == 0 ? nil : true
@@ -164,6 +167,7 @@ def nil_if_first_time
               def initialize
                 @counter = -1
               end
+
               def false_if_first_time
                 @counter += 1
                 @counter > 0
@@ -189,8 +193,8 @@ def false_if_first_time
 
         describe "in shared_context" do
           shared_context "shared stuff" do
-            subject {Array}
-            its(:name) {should eq "Array"}
+            subject { Array }
+            its(:name) { should eq "Array" }
           end
 
           include_context "shared stuff"
@@ -215,8 +219,19 @@ def false_if_first_time
           end
         end
       end
+      context "with metadata" do
+        context "preserves access to metadata that doesn't end in hash" do
+          its([], :foo) do |example|
+            expect(example.metadata[:foo]).to be(true)
+          end
+        end
+        context "preserves access to metadata that ends in hash" do
+          its([], :foo, :bar => 17) do |example|
+            expect(example.metadata[:foo]).to be(true)
+            expect(example.metadata[:bar]).to be(17)
+          end
+        end
+      end
     end
   end
-
-
 end