unidom-common-rspec 1.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5755de5fe32c294c67ba6796498142cdeee98092524661746f56c90e8c97924e
-  data.tar.gz: 152301ee160e24f78b4bcf0f09b1cddce5f274487310191d105ccd0357537837
+  metadata.gz: '08978e31550f24686da26c0a790887b6fe033aac165ec7db16bb4dcc5f56b1cb'
+  data.tar.gz: 78c99b4e6a005aa3313bc7c88ea88e32141ba4bd6d34981e6c90db7c9dd17328
 SHA512:
-  metadata.gz: 48c808e177675177d5af581b2804e7dfb5c5815da73c5c5ae82f5a95adb23ba7ec38592dae82feb7acd38a8b4eb33abaaf0a992f6127307006b1a90f6293555a
-  data.tar.gz: dddfea95c685f0d4ed9e2737bd5ec4caf9c4b3d8290bc761d64acc127245eb14be0f61df17f6944a1f6ea8bcbd8f15b57a871e6d608078388aa6344011dfe79c
+  metadata.gz: '0902ba335e02cd60910258edbe8a89fc488205a5983b4d2084b4971c935b89c12250cab02baeb6c120d2f132ead3a75d095eda3c8356f02ffd8501da25a130c3'
+  data.tar.gz: f928fc097ae1207abda9b12f497c425e0f43b6068bf9fab9b450b92f7526050e2eced2efb949bf1657564860e8f46a6831e4149d38bc3dc89d789e4698cfe395

data/CHANGELOG.md

@@ -78,3 +78,7 @@
 ## v1.1
 
 1. Improved the Ruby Gem Specification to depend on Rake v13.0, & RSpec v3.9
+
+## v2.0
+
+1. Improved the Scope shared examples for Ruby 3.0

data/README.md

@@ -27,12 +27,15 @@ gem 'unidom-common-rspec'
 
 And then execute:
 
-    $ bundle
+```shell
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install unidom-common-rspec
-
+```shell
+$ gem install unidom-common-rspec
+```
 
 
 ## Usage

data/ROADMAP.md

@@ -78,3 +78,7 @@
 ## v1.1
 
 1. Improve the Ruby Gem Specification to depend on Rake v13.0, & RSpec v4.0
+
+## v2.0
+
+1. Improve the Scope shared examples for Ruby 3.0

data/lib/unidom/common/rspec.rb

@@ -1,4 +1,6 @@
-require "unidom/common/rspec/version"
+require 'rspec/core'
+
+require 'unidom/common/rspec/version'
 
 require 'unidom/common/rspec/assert_present_shared_examples'
 

data/lib/unidom/common/rspec/scope_shared_examples.rb

@@ -6,19 +6,41 @@ shared_examples 'scope' do |scope_name, fixtures|
 
   fixtures.select { |fixture| 'E'!=fixture[:count_diff] } .each do |fixture|
     describe ".#{scope_name}(#{fixture[:args].blank? ? '' : (fixture[:args].map &:inspect).join(', ')})" do
+
       before :each do
-        @count = fixture[:args].present? ? described_class.send(scope_name, *fixture[:args]).count : described_class.send(scope_name).count
+        #@count = fixture[:args].present? ? described_class.send(scope_name, *fixture[:args]).count : described_class.send(scope_name).count
+        if fixture[:args].present?
+          if fixture[:args][0].is_a? Hash
+            @count = described_class.send(scope_name, **fixture[:args][0]).count
+          else
+            @count = described_class.send(scope_name, *fixture[:args]).count
+          end
+        else
+          @count = described_class.send(scope_name).count
+        end
         @model_instances = []
         fixture[:attributes_collection].each do |attributes| @model_instances << (described_class.create! attributes) end
       end
+
       after :each do
         @count = 0
         @model_instances.each do |model_instance| model_instance.destroy end if @model_instances.present?
       end
+
       it "has #{fixture[:count_diff]} added" do
-        actual_count = fixture[:args].present? ? described_class.send(scope_name, *fixture[:args]).count : described_class.send(scope_name).count
+        if fixture[:args].present?
+          if fixture[:args][0].is_a? Hash
+            actual_count = described_class.send(scope_name, **fixture[:args][0]).count
+          else
+            actual_count = described_class.send(scope_name, *fixture[:args]).count
+          end
+        else
+          actual_count = described_class.send(scope_name).count
+        end
+        #actual_count = fixture[:args].present? ? described_class.send(scope_name, **fixture[:args][0]).count : described_class.send(scope_name).count
         expect(actual_count).to eq(fixture[:count_diff]+@count)
       end
+
     end
   end
 

data/lib/unidom/common/rspec/version.rb

@@ -1,7 +1,7 @@
 module Unidom
   module Common
     module RSpec
-      VERSION = '1.1'
+      VERSION = '2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-common-rspec
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '2.0'
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -106,7 +106,7 @@ homepage: https://github.com/topbitdu/unidom-common-rspec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Unidom Common RSpec 是为 Unidom Common 设计的基于 RSpec 的共享测试用例。
 test_files: []