cypress-on-rails 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdceb59a86819c5367bbdcf74e91a29a61a5b716
-  data.tar.gz: e900005562f5a7b6d921da8851dd78e8d8efbc80
+  metadata.gz: 7aec96956fcdd7eedf0d5f734cc81e134724c6e5
+  data.tar.gz: 300cecad4faa328db420de5d0a2b598f38f2506a
 SHA512:
-  metadata.gz: eaf7e9782d23916147a28f8c83943143b688f3421a1f8985045255054898100abca0ec840b54b95744a0ead8f3fc0a980ebe38f6ab54f92f3cd48e44118ebb1d
-  data.tar.gz: 2266629a6a23dd8280123cf1f6f56660764ea1894f482603016e0e560afa094079086863809f5f3931da87d3efcb442aaba87ff0563c8f969cc48cd18721145a
+  metadata.gz: 6e132c239e673c30b9b4beeeabed6888a05663d3aac596efaa65bfd914f3f3529bf31951e65d3194283f36cd53fd1834e309eb71d5383040fd4135c34beab94e
+  data.tar.gz: 5c34509322e7262d239f5185490c737109e10af613e1e869edec42cc394f792656c598a19b297d93b6026f0d004622416d425b48a71c54c7dfeadc30d90bd8fa

data/.gitignore

@@ -5,3 +5,4 @@ spec/examples.txt
 .idea
 spec/test.log
 pkg/*.gem
+vendor/bundle

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.8.0]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.7.0...v1.8.0
+
+### Changed
+* Use `FactoryBo#reload` to reset factory bot
+
 ## [1.7.0]
 [Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.6.0...v1.7.0
 

data/cypress-on-rails.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'railties', '>= 3.2'
+  s.add_development_dependency 'factory_bot'
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/shakacode/cypress-on-rails/issues",
     "changelog_uri"     => "https://github.com/shakacode/cypress-on-rails/blob/master/CHANGELOG.md",

data/lib/cypress_on_rails/simple_rails_factory.rb

@@ -12,5 +12,9 @@ module CypressOnRails
         create(type,*params)
       end
     end
+
+    # to be API compatible with factorybot
+    def self.definition_file_paths=(*); end
+    def self.reload; end
   end
 end

data/lib/cypress_on_rails/smart_factory_wrapper.rb

@@ -3,15 +3,6 @@ require 'cypress_on_rails/simple_rails_factory'
 
 module CypressOnRails
   class SmartFactoryWrapper
-    module FactoryCleaner
-      def self.clean(f = FactoryBot)
-        f.factories.clear if f.respond_to?(:factories)
-        f.traits.clear if f.respond_to?(:traits)
-        f.callbacks.clear if f.respond_to?(:callbacks)
-        f.sequences.clear if f.respond_to?(:sequences)
-      end
-    end
-
     def self.instance
       @instance ||= new(files: [], factory: SimpleRailsFactory)
     end
@@ -33,14 +24,13 @@ module CypressOnRails
     attr_accessor :always_reload
 
     def initialize(files:, factory:, always_reload: false,
-                   factory_cleaner: FactoryCleaner, kernel: Kernel, file_system: File,
-                   dir_system: Dir)
+                   kernel: Kernel, file_system: File, dir_system: Dir)
       self.files = files
       self.factory = factory
+      factory.definition_file_paths = []
       self.always_reload = always_reload
       @kernel = kernel
       @file_system = file_system
-      @factory_cleaner = factory_cleaner
       @latest_mtime = nil
       @dir_system = dir_system
     end
@@ -83,7 +73,7 @@ module CypressOnRails
       return unless should_reload?(current_latest_mtime)
       logger.info 'Loading Factories'
       @latest_mtime = current_latest_mtime
-      @factory_cleaner.clean(factory)
+      factory.reload
       files.each do |file|
         logger.debug "-- Loading: #{file}"
         @kernel.load(file)

data/lib/cypress_on_rails/version.rb

@@ -1,3 +1,3 @@
 module CypressOnRails
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

data/spec/cypress_on_rails/smart_factory_wrapper_spec.rb

@@ -1,4 +1,5 @@
 require 'cypress_on_rails/smart_factory_wrapper'
+require 'factory_bot'
 
 RSpec.describe CypressOnRails::SmartFactoryWrapper do
   FileSystemDummy = Struct.new(:file_hash) do
@@ -10,8 +11,9 @@ RSpec.describe CypressOnRails::SmartFactoryWrapper do
   let(:time_now) { Time.now }
   let(:mtime_hash) { {'file1.rb' => time_now, 'file2.rb' => time_now } }
   let(:files) { %w(file1.rb file2.rb) }
-  let(:factory_double) { double('FactoryBot', create: true, create_list: true) }
-  let(:factory_cleaner) { class_double(CypressOnRails::SmartFactoryWrapper::FactoryCleaner, clean: true) }
+  let(:factory_double) do
+    class_double(FactoryBot, create: nil, create_list: nil, "definition_file_paths=": nil, reload: nil)
+  end
   let(:kernel_double) { class_double(Kernel, load: true) }
   let(:file_double) { FileSystemDummy.new(mtime_hash) }
   let(:dir_double) { class_double(Dir) }
@@ -25,8 +27,7 @@ RSpec.describe CypressOnRails::SmartFactoryWrapper do
                         factory: factory_double,
                         kernel: kernel_double,
                         file_system: file_double,
-                        dir_system: dir_double,
-                        factory_cleaner: factory_cleaner)
+                        dir_system: dir_double)
   end
 
   it 'loads all the files on first create it' do
@@ -68,7 +69,7 @@ RSpec.describe CypressOnRails::SmartFactoryWrapper do
 
   it 'wont load the files if they have not changed' do
     subject.create(:user)
-    subject.create_list(:user)
+    subject.create_list(:user, 2)
     expect(kernel_double).to have_received(:load).with('file1.rb').once
     expect(kernel_double).to have_received(:load).with('file2.rb').once
   end
@@ -79,7 +80,7 @@ RSpec.describe CypressOnRails::SmartFactoryWrapper do
     expect(kernel_double).to have_received(:load).with('file2.rb').once
 
     mtime_hash['file1.rb'] = Time.now
-    subject.create_list(:user)
+    subject.create_list(:user, 2)
     expect(kernel_double).to have_received(:load).with('file1.rb').twice
     expect(kernel_double).to have_received(:load).with('file2.rb').twice
   end
@@ -91,24 +92,24 @@ RSpec.describe CypressOnRails::SmartFactoryWrapper do
     expect(kernel_double).to have_received(:load).with('file2.rb').once
 
     mtime_hash.delete('file1.rb')
-    subject.create_list(:user)
+    subject.create_list(:user, 2)
     expect(kernel_double).to have_received(:load).with('file1.rb').once
     expect(kernel_double).to have_received(:load).with('file2.rb').twice
   end
 
-  it 'will reset factory if a has changed' do
+  it 'will reset factory if a file has changed' do
     subject.create(:user)
-    expect(factory_cleaner).to have_received(:clean).with(factory_double)
+    expect(factory_double).to have_received(:reload)
 
     mtime_hash['file1.rb'] = Time.now
-    subject.create_list(:user)
+    subject.create_list(:user, 2)
 
-    expect(factory_cleaner).to have_received(:clean).with(factory_double).twice
+    expect(factory_double).to have_received(:reload).twice
   end
 
   it 'will always reload the files enabled' do
     subject.always_reload = true
-    subject.create_list(:user)
+    subject.create_list(:user, 2)
     subject.create(:user)
     expect(kernel_double).to have_received(:load).with('file1.rb').twice
     expect(kernel_double).to have_received(:load).with('file2.rb').twice

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cypress-on-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - miceportal team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -67,6 +67,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Integrates cypress with rails or rack applications
 email:
 - info@miceportal.de