rspec-parameterized 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ec74624713209b381c818242bdc31bed08c769
-  data.tar.gz: a369308c5fa930c420763d32dbdc7d3f5e856002
+  metadata.gz: 2e6be52e986b05c5db18dc2355e2ee393b0ee954
+  data.tar.gz: 191bb660e0afdc89f466f1213a4ce756ba9566e1
 SHA512:
-  metadata.gz: 21671b32125d34ef3efb84f11bbdb4a4a0f501f110c367e0b56b8999fa70254d7cd6dab31b33d0ac8ae485a2e7bcbbdb6345e262787cccc258c27940949799bb
-  data.tar.gz: 2142247c46e8093a87bfab1deb178185952be853068e7503c35861c990123dad2816a5eccaf6bc3698bec93ba443653b90ec1ce68698423fc020d1efec799a78
+  metadata.gz: 7cce6711e56fb75d458b75b1fc4a9d47f7908395040bfc0eec9b809b66b5cbe0f5ec8663747b1b40e053286aafccfd9884eb4d2c97358414cc09191cfe74cef7
+  data.tar.gz: 9a5e59b1d28cd1bf826346c61d0953daba8bb6f198966d03024c98f1570a02e50b79f6ed5a89032fb805b7a50131ff5ceea8159965d59dc5c8cfd94ccf8c183f

data/CHANGELOG.md

@@ -1,11 +1,12 @@
 # Change Log
 
-## [Unreleased](https://github.com/tomykaira/rspec-parameterized/tree/HEAD)
-
-[Full Changelog](https://github.com/tomykaira/rspec-parameterized/compare/v0.3.1...HEAD)
+## [v0.3.2](https://github.com/tomykaira/rspec-parameterized/tree/v0.3.2) (2016-12-26)
+[Full Changelog](https://github.com/tomykaira/rspec-parameterized/compare/v0.3.1...v0.3.2)
 
 **Merged pull requests:**
 
+- Fix deprecation warning on ruby 2.4.0 [\#40](https://github.com/tomykaira/rspec-parameterized/pull/40) ([sue445](https://github.com/sue445))
+- Add release note for v0.3.1 [\#39](https://github.com/tomykaira/rspec-parameterized/pull/39) ([sue445](https://github.com/sue445))
 - Add rubygems version badge [\#38](https://github.com/tomykaira/rspec-parameterized/pull/38) ([sue445](https://github.com/sue445))
 
 ## [v0.3.1](https://github.com/tomykaira/rspec-parameterized/tree/v0.3.1) (2016-08-17)

data/README.md

@@ -72,6 +72,81 @@ describe "plus" do
     end
   end
 end
+
+# Verbose Syntax
+# For complex inputs or if you just want to be super explicit
+describe "Verbose syntax" do
+  where do
+    {
+      "positive integers" => {
+        a: 1,
+        b: 2,
+        answer: 3,
+      },
+      "negative_integers" => {
+        a: -1,
+        b: -2,
+        answer: -3,
+      },
+      "mixed_integers" => {
+        a: 3,
+        b: -3,
+        answer: 0,
+      },
+    }
+  end
+
+  with_them do
+    it "should do additions" do
+      expect(a + b).to eq answer
+    end
+  end
+end
+
+# It's also possible to override each combination name using magic variable :case_name
+# Output:
+# Custom test case name
+#   positive integers
+#     should do additions
+#   negative integers
+#     should do additions
+#   mixed integers
+#     should do additions
+describe "Custom names for regular syntax" do
+  where(:case_name, :a, :b, :answer) do
+    [
+      ["positive integers",  6,  2,  8],
+      ["negative integers", -1, -2, -3],
+      [   "mixed integers", -5,  3, -2],
+    ]
+  end
+
+  with_them do
+    it "should do additions" do
+      expect(a + b).to eq answer
+  end
+end
+
+# Or :case_names lambda for hash syntax
+# Output:
+# when hash arguments
+#   1 + 5 + 2
+#     sum is even
+#   1 + 5 + 4
+#     sum is even
+#   1 + 7 + 2
+#     sum is even
+#   ...
+describe "Custom naming for hash syntax" do
+  where(case_names: ->(a, b, c){"#{a} + #{b} + #{c}"}, a: [1, 3], b: [5, 7, 9], c: [2, 4])
+
+  with_them do
+    it "sum is even" do
+      expect(a + b + c).to be_even
+    end
+  end
+end
+
 ```
 
 I was inspired by [udzura's mock](https://gist.github.com/1881139).

data/lib/rspec/parameterized.rb

@@ -40,12 +40,22 @@ module RSpec
       def where(*args, &b)
 
         if args.size == 1 && args[0].instance_of?(Hash)
+          naming_func = args.first.delete(:case_names)
           params = args[0]
           first, *rest = params.values
+          arg_names = params.keys
+          arg_values = first.product(*rest)
 
-          set_parameters(params.keys) {
-            first.product(*rest)
+          if naming_func && naming_func.respond_to?(:call)
+            arg_names << :case_name
+            arg_values.map! { |row| row << naming_func.call(*row) }
+          end
+
+          set_parameters(arg_names) {
+            arg_values
           }
+        elsif args.size == 0
+          set_verbose_parameters(&b)
         else
           set_parameters(args, &b)
         end
@@ -99,7 +109,7 @@ module RSpec
 
         param_sets.each do |param_set|
           pairs = [parameter.arg_names, param_set].transpose.to_h
-          pretty_params = pairs.map {|name, val| "#{name}: #{params_inspect(val)}"}.join(", ")
+          pretty_params = pairs.has_key?(:case_name) ? pairs[:case_name] : pairs.map {|name, val| "#{name}: #{params_inspect(val)}"}.join(", ")
           describe(pretty_params, *args) do
             pairs.each do |name, val|
               let(name) { val }
@@ -135,6 +145,23 @@ module RSpec
           return obj.inspect
         end
       end
+
+      def set_verbose_parameters(&block)
+        arguments_hash = yield
+        arg_names = arguments_hash.values.reduce(Set.new) { |memo, pairs| memo | pairs.keys }.to_a
+        arg_values = []
+        arguments_hash.each do |name, values_hash|
+          row = [name]
+          arg_names.each do |argument_name|
+              row << values_hash[argument_name]
+          end
+          arg_values << row
+        end
+        arg_names.unshift(:case_name)
+        set_parameters(arg_names) {
+          arg_values
+        }
+      end
     end
   end
 

data/lib/rspec/parameterized/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Parameterized
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/spec/parametarized_spec.rb

@@ -66,6 +66,131 @@ describe RSpec::Parameterized do
     end
   end
 
+  describe "Verbose syntax" do
+    where do
+      {
+        "positive integers" => {
+          a: 1,
+          b: 2,
+          answer: 3,
+        },
+        "negative_integers" => {
+          a: -1,
+          b: -2,
+          answer: -3,
+        },
+        "mixed_integers" => {
+          a: 3,
+          b: -3,
+          answer: 0,
+        },
+      }
+    end
+
+    with_them do
+      it "should do additions" do
+        expect(a + b).to eq answer
+      end
+
+      it "should have custom name" do |example|
+        expect(example.metadata[:example_group][:description]).to eq case_name
+      end
+    end
+
+    context "lambda parameter" do
+      where do
+        {
+          "integers" => {
+            a: 1,
+            b: 2,
+            answer: -> {expect(subject).to eq 3},
+          },
+          "strings" => {
+            a: "hello ",
+            b: "world",
+            answer: -> {expect(subject).to include "lo wo"},
+          },
+          "arrays" => {
+            a: [1, 2, 3],
+            b: [4, 5, 6],
+            answer: -> {expect(subject.size).to eq 6}
+          }
+        }
+      end
+
+      with_them do
+        subject {a + b}
+        it "should do additions" do
+          self.instance_exec(&answer)
+        end
+
+        it "should have custom name" do |example|
+          expect(example.metadata[:example_group][:description]).to eq(case_name)
+        end
+      end
+    end
+  end
+
+  describe "Custom test case name" do
+    context "when regular arguments" do
+      where(:case_name, :a, :b, :answer) do
+        [
+          ["positive integers",  6,  2,  8],
+          ["negative integers", -1, -2, -3],
+          [   "mixed integers", -5,  3, -2],
+        ]
+      end
+
+      with_them do
+        it "should do additions" do
+          expect(a + b).to eq answer
+        end
+
+        it "should have custom test name" do |example|
+          expect(example.metadata[:example_group][:description]).to eq case_name
+        end
+      end
+    end
+
+    context "when hash arguments" do
+      where(case_names: ->(a, b, c){"#{a} + #{b} + #{c}"}, a: [1, 3], b: [5, 7, 9], c: [2, 4])
+
+      with_them do
+        it "sum is even" do
+          expect(a + b + c).to be_even
+        end
+
+        it "should have custom names" do |example|
+          expect(example.metadata[:example_group][:description]).to include "+"
+        end
+      end
+    end
+
+    if RUBY_VERSION >= "2,1"
+      context "when arguments are separated with pipe (using TableSyntax)" do
+        using RSpec::Parameterized::TableSyntax
+
+        where(:case_name, :a, :b, :answer) do
+          "integers"      | 1                     | 2                     | 3
+          "strings"       | "hello "              | "world"               | "hello world"
+          "arrays"        | [1, 2, 3]             | [4, 5, 6]             | [1, 2, 3, 4, 5, 6]
+          "giant numbers" | 100000000000000000000 | 100000000000000000000 | 200000000000000000000
+        end
+
+        with_them do
+          it "a plus b is answer" do
+            expect(a + b).to eq answer
+          end
+
+          it "should have custom test name" do |example|
+            expect(example.metadata[:example_group][:description]).to eq case_name
+          end
+        end
+      end
+    end
+
+  end
+
   if RUBY_VERSION >= "2.1"
     describe "table separated with pipe (using TableSyntax)" do
       using RSpec::Parameterized::TableSyntax

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-parameterized
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - tomykaira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: RSpec::Parameterized supports simple parameterized test syntax in rspec.