cucumber_factory 1.11.8 → 1.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2474f1242ac52bc7d8ed0e36fcf51f5fea0301c9
-  data.tar.gz: 3cbeb16d2fe2cd2038bc22e937046af0f0743e53
+  metadata.gz: cf308118b2098c3650288d2da08549d6f1f51c07
+  data.tar.gz: 8325e52892d5331e2c5d9a0670ad8883e8519783
 SHA512:
-  metadata.gz: 0cea20126d458263a37d369acefc48855cf156d92a81d6b6776373d0c7fdcc4982646166c747afdbd17cdb0428da6cf39114f19c3d535cc25014ed5b349ef0f1
-  data.tar.gz: 47f468e206ea8fc20ef02ae343cc048bf47e794f4e9549cf5e474f9919f9bcbbf45007200fa957e8dfd966003b3e79a34c85e454c50e5c7ba707c40fe533cbd1
+  metadata.gz: d4111f40061523a16fb4845487beadc7ea8580e9bc47b7e701fadd8ced980cc4444b02fbdcc3b55c4f825b1dc7e7494988ef48f8b121c108ef0e31b31820cae5
+  data.tar.gz: '0186bd34d5f8325d5bd355d6eedc927f66f1c685b9166990af20a282f12394c340aed9d378c31fbdddcca99f1ac462762a5a6bc9b1c3bdb619a57e94733ef7b6'

data/gemfiles/Gemfile.cucumber-1.3.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cucumber_factory (1.11.7)
+    cucumber_factory (1.11.8)
       activerecord
       activesupport
       cucumber
@@ -50,4 +50,4 @@ DEPENDENCIES
   rspec (~> 1.0)
 
 BUNDLED WITH
-   1.13.7
+   1.16.0

data/gemfiles/Gemfile.cucumber-2.4.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cucumber_factory (1.11.7)
+    cucumber_factory (1.11.9)
       activerecord
       activesupport
       cucumber
@@ -81,4 +81,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.13.7
+   1.14.6

data/gemfiles/Gemfile.cucumber-3.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    cucumber_factory (1.11.7)
+    cucumber_factory (1.11.9)
       activerecord
       activesupport
       cucumber
@@ -81,4 +81,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.13.7
+   1.14.6

data/lib/cucumber_factory/switcher.rb

@@ -5,7 +5,13 @@ module CucumberFactory
     def find_last(klass)
       # Don't use class.last, in sqlite that is not always the last inserted element
       # If created_at is available prefer it over id as column for ordering so that we can handle UUIDs
-      order_column = klass.column_names.include?('created_at') ? 'created_at, id' : 'id'
+      primary_key = klass.primary_key
+      has_numeric_primary_key = klass.columns_hash[primary_key].type == :integer
+      order_column = if has_numeric_primary_key || !klass.column_names.include?('created_at')
+        primary_key
+      else
+        "created_at, #{primary_key}"
+      end
       if active_record_version < 4
         klass.find(:last, :order => order_column)
       else

data/lib/cucumber_factory/version.rb

@@ -1,3 +1,3 @@
 module CucumberFactory
-  VERSION = '1.11.8'
+  VERSION = '1.11.9'
 end

data/spec/cucumber_factory/steps_spec.rb

@@ -171,16 +171,22 @@ describe 'steps provided by cucumber_factory' do
     before_sunset.reviewer.should == user
   end
 
-  it "should give created_at precedence over id when saying 'above' so that records with UUIDs are handled correctly" do
+  it "should give created_at precedence over id when saying 'above' if the primary key is not numeric" do
+    invoke_cucumber_step('there is a uuid user with the name "Jane" and the id "jane"')
+    invoke_cucumber_step('there is a uuid user with the name "John" and the id "john"')
+    UuidUser.find_by_name("John").update_attributes!(:created_at => 1.day.ago)
+    invoke_cucumber_step('there is a movie with the title "Before Sunset" and the uuid reviewer above')
+    before_sunset = Movie.find_by_title!("Before Sunset")
+    before_sunset.uuid_reviewer.name.should == "Jane"
+  end
+
+  it "should ignore created_at if the primary key is numeric" do
     invoke_cucumber_step('there is a user with the name "Jane"')
     invoke_cucumber_step('there is a user with the name "John"')
     User.find_by_name("John").update_attributes!(:created_at => 1.day.ago)
-    invoke_cucumber_step('there is a movie with the title "Limitless"')
-    invoke_cucumber_step('there is a movie with the title "Before Sunrise"')
-    invoke_cucumber_step('there is a movie with the title "Before Sunset" and the reviewer above and the prequel above')
+    invoke_cucumber_step('there is a movie with the title "Before Sunset" and the reviewer above')
     before_sunset = Movie.find_by_title!("Before Sunset")
-    before_sunset.prequel.title.should == "Before Sunrise"
-    before_sunset.reviewer.name.should == "Jane"
+    before_sunset.reviewer.name.should == "John"
   end
 
   it "should raise a proper error if there is no previous record when saying 'above'" do

data/spec/support/database.rb

@@ -5,6 +5,7 @@ Gemika::Database.new.rewrite_schema! do
     t.integer :year
     t.integer :prequel_id
     t.integer :reviewer_id
+    t.string :uuid_reviewer_id
     t.integer :box_office_result
   end
 
@@ -19,6 +20,13 @@ Gemika::Database.new.rewrite_schema! do
     t.datetime :created_at
   end
 
+  create_table :uuid_users, :id => false do |t|
+    t.string :id
+    t.string :email
+    t.string :name
+    t.datetime :created_at
+  end
+
   create_table :payments do |t|
     t.text :comment
     t.integer :amount

data/spec/support/models/movie.rb

@@ -2,6 +2,7 @@ class Movie < ActiveRecord::Base
 
   belongs_to :prequel, :class_name => "Movie"
   belongs_to :reviewer, :class_name => "User"
+  belongs_to :uuid_reviewer, :class_name => "UuidUser"
 
   validate do |record|
     record.errors.add(:reviewer, 'may not be deleted') if record.reviewer and record.reviewer.deleted?

data/spec/support/models/uuid_user.rb

@@ -0,0 +1,5 @@
+class UuidUser < ActiveRecord::Base
+
+  self.primary_key = 'id'
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber_factory
 version: !ruby/object:Gem::Version
-  version: 1.11.8
+  version: 1.11.9
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -110,6 +110,7 @@ files:
 - spec/support/models/people/actor.rb
 - spec/support/models/plain_ruby_class.rb
 - spec/support/models/user.rb
+- spec/support/models/uuid_user.rb
 homepage: http://github.com/makandra/cucumber_factory
 licenses:
 - MIT