cypress-on-rails 1.5.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 49942b0febcf64950936386fdbcbec0601534923
-  data.tar.gz: dba819774cec41583fb545fe2517a9baceaf029a
+SHA256:
+  metadata.gz: b729d2f84bc4c0ae47bf5604c2f51a8c9c5b793f8256a3e698e127cbb5b54974
+  data.tar.gz: 957791607d573fe7a5d1193df5fc59b7c99f349bf023a71827c2de0dc77e2ffe
 SHA512:
-  metadata.gz: dd5ab5135eeec0405b53356e5205956a5ea2f7230341663ac206b76292eb895eef297a96e28345f94dd78ffc8cbda2c54ac0b408dec097dc18edfb760da2ef53
-  data.tar.gz: ca4fb0a7f72ad6341fcb3c14aa22b6142ed95ffa3a77a5e6e229eeb3fc0d6e9290bb67edec65edb99ecae093044b4a795dc1611c6c5b193e764dcc76a1072e71
+  metadata.gz: 889c0983aeb92cbbbb7cc51ffdb33033bfc33d169bf123483f63b417b522cbdd3e62f1855b4ea36b47d866d6dd2c26fba0e63a939e6e1573640604ee0833cab3
+  data.tar.gz: 1cfabe2cd7c2a39b622aff2c140babd7818050f7289973a4f89d08803906540d78113f4826d1eb07b1f6ebbedc0f334bab3688e2576d375d60a800d9c7197d20

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [shakacode]

data/.gitignore

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

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
   - 2.3
+  - 2.4
   - 2.5
   - 2.6
+#  - 2.7
 
 #addons:
 #  artifacts:
@@ -24,9 +26,14 @@ before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y build-essential patch ruby-dev zlib1g-dev liblzma-dev libxml2-dev
   - sudo apt-get install -y xvfb libgtk2.0-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2
+  - travis_retry nvm install 14.13.1
+  - node -v
+  - nvm alias default 14.13.1
 
 script:
   - bundle exec rake
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
   - ./spec/integrations/rails_5_2/test.sh
   - ./spec/integrations/rails_4_2/test.sh
   - ./spec/integrations/rails_3_2/test.sh

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+## [1.9.0]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.8.1...v1.9.0
+
+### Changed
+* Update default generated folder to cypress instead of spec/cypress
+* Add a generator option to not install cypress
+* generator by default does not include examples
+* default on local to run cypress in development mode
+
+## [1.8.1]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.8.0...v1.8.1
+
+### Fixed
+* remove "--silent" option when adding cypress [PR 76](https://github.com/shakacode/cypress-on-rails/pull/76)
+* update cypress examples to use "preserve" instead of "whitelist" [PR 75](https://github.com/shakacode/cypress-on-rails/pull/75) by [alvincrespo](https://github.com/alvincrespo)
+
+## [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
+
+### Changed
+*  Improve eval() in command executor [PR 46](https://github.com/shakacode/cypress-on-rails/pull/46) by [Systho](https://github.com/Systho)
+
+### Fixed
+* Add middleware after load_config_initializers [PR 62](https://github.com/shakacode/cypress-on-rails/pull/62) by [duytd](https://github.com/duytd)
+
+## [1.6.0]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.5.1...v1.6.0
+
+### Changed
+* Change default port to 5017 [PR 49](https://github.com/shakacode/cypress-on-rails/pull/49) by [vfonic](https://github/vfonic)
+
+### Fixed
+* fix file location warning message in clean.rb [PR 54](https://github.com/shakacode/cypress-on-rails/pull/54) by [ootoovak](https://github.com/ootoovak)
+
 ## [1.5.1]
 [Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.5.0...v1.5.1
 
@@ -32,7 +72,7 @@
 * Update Travis CI badge in README [PR 31](https://github.com/shakacode/cypress-on-rails/pull/31)
 * Fix CI by Installing cypress dependencies on Travis CI [PR 31](https://github.com/shakacode/cypress-on-rails/pull/31)
 
-## [1.4.0] 
+## [1.4.0]
 [Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.3.0...v1.4.0
 
 * Accept an options argument for scenarios. [PR 18](https://github.com/shakacode/cypress-on-rails/pull/18) by [ericraio](https://github.com/ericraio).
@@ -98,6 +138,14 @@
 ## 0.1.2 (2017-10-31)
 * First release.
 
+[1.8.0]: https://github.com/shakacode/cypress-on-rails/compare/v1.7.0...v1.8.0
+[1.7.0]: https://github.com/shakacode/cypress-on-rails/compare/v1.6.0...v1.7.0
+[1.6.0]: https://github.com/shakacode/cypress-on-rails/compare/v1.5.1...v1.6.0
+[1.5.1]: https://github.com/shakacode/cypress-on-rails/compare/v1.5.0...v1.5.1
+[1.5.0]: https://github.com/shakacode/cypress-on-rails/compare/v1.4.2...v1.5.0
+[1.4.2]: https://github.com/shakacode/cypress-on-rails/compare/v1.4.1...v1.4.2
+[1.4.1]: https://github.com/shakacode/cypress-on-rails/compare/v1.4.0...v1.4.1
+[1.4.0]: https://github.com/shakacode/cypress-on-rails/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/shakacode/cypress-on-rails/compare/v1.2.1...v1.3.0
 [1.2.1]: https://github.com/shakacode/cypress-on-rails/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/shakacode/cypress-on-rails/compare/v1.1.1...v1.2.0

data/README.md

@@ -8,7 +8,14 @@ This project is sponsored by the software consulting firm [ShakaCode](https://ww
 
 ----
 
-Gem for using [cypress.io](http://github.com/cypress-io/) in Rails and ruby rack applications 
+# Totally new to Cypress?
+Suggest you first learn the basics of Cypress before attempting to integrate with Ruby on Rails
+
+* [Good start Here](https://docs.cypress.io/examples/examples/tutorials.html#Best-Practices)
+
+## Overview
+
+Gem for using [cypress.io](http://github.com/cypress-io/) in Rails and ruby rack applications
 with the goal of controlling State as mentioned in [Cypress Best Practices](https://docs.cypress.io/guides/references/best-practices.html#Organizing-Tests-Logging-In-Controlling-State)
 
 It allows to run code in the application context when executing cypress tests.
@@ -24,44 +31,68 @@ Has examples of setting up state with:
 * scenarios
 * custom commands
 
-This gem is based off https://github.com/konvenit/cypress-on-rails
+## Resources
+* [Video of getting started with this gem](https://grant-ps.blog/2018/08/10/getting-started-with-cypress-io-and-ruby-on-rails/)
+* [Article: Introduction to Cypress on Rails](https://www.shakacode.com/blog/introduction-to-cypress-on-rails/)
 
-Video of getting started with this gem https://grant-ps.blog/2018/08/10/getting-started-with-cypress-io-and-ruby-on-rails/
-
-## Getting started
+## Installation
 
 Add this to your Gemfile:
-```
+
+```ruby
 group :test, :development do
   gem 'cypress-on-rails', '~> 1.0'
 end
 ```
 
 Generate the boilerplate code using:
-```
+
+```shell
 bin/rails g cypress_on_rails:install
 
-# if you have/want a different cypress folder (default is spec/cypress)
-bin/rails g cypress_on_rails:install --cypress_folder=test/cypress
+# if you have/want a different cypress folder (default is cypress)
+bin/rails g cypress_on_rails:install --cypress_folder=spec/cypress
 
 # if you want to install cypress with npm
 bin/rails g cypress_on_rails:install --install_cypress_with=npm
 
+# if you already have cypress installed globally
+bin/rails g cypress_on_rails:install --no-install-cypress
+
 # to update the generated files run
 bin/rails g cypress_on_rails:update
 ```
 
-The generator adds the following files/directory to your application:
+The generator modifies/adds the following files/directory in your application:
+* `config/environments/test.rb`
 * `config/initializers/cypress_on_rails` used to configure CypressDev
 * `spec/cypress/integrations/` contains your cypress tests
 * `spec/cypress/support/on-rails.js` contains CypressDev support code
 * `spec/cypress/app_commands/scenarios/` contains your CypressDev scenario definitions
 * `spec/cypress/cypress_helper.rb` contains helper code for CypressDev app commands
 
-if you are not using database_cleaner look at `spec/cypress/app_commands/clean_db.rb`.
+if you are not using database_cleaner look at `spec/cypress/app_commands/clean.rb`.
 if you are not using factory_bot look at `spec/cypress/app_commands/factory_bot.rb`.
 
-Now you can create scenarios and commands that are plan ruby files that get loaded through middleware, the ruby sky is your limit.
+Now you can create scenarios and commands that are plain ruby files that get loaded through middleware, the ruby sky is your limit.
+
+### Update your database.yml
+
+When writing cypress test on your local it's recommended to start your server in development mode so that changes you
+make are picked up without having to restart the server. 
+It's recommend you update your database.yml to check if the CYPRESS environment variable is set and switch it to the test database
+otherwise cypress will keep clearing your development database.
+
+for example:
+
+```yaml
+development:
+  <<: *default
+  database: <%= ENV['CYPRESS'] ? 'my_db_test' : 'my_db_development' %>
+test:
+  <<: *default
+  database: my_db_test
+```
 
 ### WARNING
 *WARNING!!:* cypress-on-rails can execute arbitrary ruby code
@@ -69,18 +100,33 @@ Please use with extra caution if starting your local server on 0.0.0.0 or runnin
 
 ## Usage
 
-Start the rails server in test mode and start cypress
+Getting started on your local environment
 
-```
+```shell
 # start rails
-RAILS_ENV=test bin/rake db:create db:schema:load
-bin/rails server -e test -p 5002
+CYPRESS=1 bin/rails server -p 5017
 
 # in separate window start cypress
+yarn cypress open 
+# or for npm
+node_modules/.bin/cypress open 
+# or if you changed the cypress folder to spec/cypress
 yarn cypress open --project ./spec
 ```
 
+How to run cypress on CI
+
+```shell
+# setup rails and start server in background
+# ...
+
+yarn run cypress run
+# or for npm
+node_modules/.bin/cypress run 
+```
+
 ### Example of using factory bot
+
 You can run your [factory_bot](https://github.com/thoughtbot/factory_bot) directly as well
 
 ```ruby
@@ -88,10 +134,10 @@ You can run your [factory_bot](https://github.com/thoughtbot/factory_bot) direct
 require 'cypress_on_rails/smart_factory_wrapper'
 
 CypressOnRails::SmartFactoryWrapper.configure(
-    always_reload: !Rails.configuration.cache_classes,
-    factory: FactoryBot,
-    files: Dir['./spec/factories/**/*.rb']
-) 
+  always_reload: !Rails.configuration.cache_classes,
+  factory: FactoryBot,
+  files: Dir['./spec/factories/**/*.rb']
+)
 ```
 
 ```js
@@ -101,16 +147,17 @@ describe('My First Test', function() {
     // This calls to the backend to prepare the application state
     cy.appFactories([
       ['create_list', 'post', 10],
-      ['create', 'post', {title: 'Hello World'} ]
+      ['create', 'post', {title: 'Hello World'} ],
+      ['create', 'post', 'with_comments', {title: 'Factory_bot Traits here'} ] // use traits
     ])
 
     // Visit the application under test
     cy.visit('/')
 
     cy.contains("Hello World")
-    
+
     // Accessing result
-    cy.appFactories([['create', 'invoice', { paid: false }]]).then((records) => {  
+    cy.appFactories([['create', 'invoice', { paid: false }]]).then((records) => {
      cy.visit(`/invoices/${records[0].id}`);
     });
   })
@@ -155,7 +202,7 @@ You define a scenario in the `spec/cypress/app_commands/scenarios` directory:
 Profile.create name: "Cypress Hill"
 
 # or if you have factory_bot enabled in your cypress_helper
-CypressOnRails::SmartFactoryWrapper.create(:profile, name: "Cypress Hill") 
+CypressOnRails::SmartFactoryWrapper.create(:profile, name: "Cypress Hill")
 ```
 
 Then reference the scenario in your test:
@@ -177,8 +224,8 @@ describe('My First Test', function() {
 
 create a ruby file in `spec/cypress/app_commands` directory:
 ```ruby
-# spec/cypress/app_commands/load_seed.rb 
-load "#{Rails.root}/db/seeds.rb" 
+# spec/cypress/app_commands/load_seed.rb
+load "#{Rails.root}/db/seeds.rb"
 ```
 
 Then reference the command in your test with `cy.app('load_seed')`:
@@ -186,7 +233,7 @@ Then reference the command in your test with `cy.app('load_seed')`:
 // spec/cypress/integrations/simple_spec.js
 describe('My First Test', function() {
   beforeEach(() => { cy.app('load_seed') })
-  
+
   it('visit root', function() {
     cy.visit('/')
 
@@ -209,7 +256,7 @@ CypressOnRails.configure do |c|
 end
 use CypressOnRails::Middleware
 
-run MyApp 
+run MyApp
 ```
 
 add the following file to cypress
@@ -248,7 +295,7 @@ beforeEach(() => {
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/cypress-on-rails/fork )
+1. Fork it ( https://github.com/shakacode/cypress-on-rails/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/cypress-on-rails.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = CypressOnRails::VERSION
   s.author      = ["miceportal team", 'Grant Petersen-Speelman']
   s.email       = ["info@miceportal.de", 'grantspeelman@gmail.com']
-  s.homepage    = "http://github.com/grantspeelman/cypress-on-rails"
+  s.homepage    = "http://github.com/shakacode/cypress-on-rails"
   s.summary     = "Integrates cypress with rails or rack applications"
   s.description = "Integrates cypress with rails or rack applications"
   s.post_install_message = 'The CypressDev constant is being deprecated and will be completely removed and replaced with CypressOnRails.'
@@ -19,4 +19,12 @@ 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",
+    "documentation_uri" => "https://github.com/shakacode/cypress-on-rails/blob/master/README.md",
+    "homepage_uri"      => "http://github.com/shakacode/cypress-on-rails",
+    "source_code_uri"   => "http://github.com/shakacode/cypress-on-rails"
+}
 end

data/lib/cypress_on_rails/command_executor.rb

@@ -6,7 +6,7 @@ module CypressOnRails
     def self.load(file,command_options = nil)
       load_cypress_helper
       file_data = File.read(file)
-      eval file_data
+      eval file_data, binding, file
     rescue => e
       logger.error("fail to execute #{file}: #{e.message}")
       logger.error(e.backtrace.join("\n"))

data/lib/cypress_on_rails/railtie.rb

@@ -4,7 +4,7 @@ require 'cypress_on_rails/middleware'
 
 module CypressOnRails
   class Railtie < Rails::Railtie
-    initializer :setup_cypress_middleware do |app|
+    initializer :setup_cypress_middleware, after: :load_config_initializers do |app|
       if CypressOnRails.configuration.use_middleware?
         app.middleware.use Middleware
       end

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.5.1'
+  VERSION = '1.9.0'.freeze
 end

data/lib/generators/cypress_on_rails/install_generator.rb

@@ -1,8 +1,9 @@
 module CypressOnRails
   class InstallGenerator < Rails::Generators::Base
-    class_option :cypress_folder, type: :string, default: 'spec/cypress'
+    class_option :cypress_folder, type: :string, default: 'cypress'
+    class_option :install_cypress, type: :boolean, default: true
     class_option :install_cypress_with, type: :string, default: 'yarn'
-    class_option :install_cypress_examples, type: :boolean, default: true
+    class_option :install_cypress_examples, type: :boolean, default: false
     source_root File.expand_path('../templates', __FILE__)
 
     def install_cypress
@@ -11,14 +12,16 @@ module CypressOnRails
         directories.pop
         install_dir = "#{Dir.pwd}/#{directories.join('/')}"
         command = nil
-        if options.install_cypress_with == 'yarn'
-          command = "yarn --cwd=#{install_dir} add cypress --dev --silent"
-        elsif options.install_cypress_with == 'npm'
-          command = "cd #{install_dir}; npm install cypress --save-dev --silent"
-        end
-        if command
-          say command
-          fail 'failed to install cypress' unless system(command)
+        if options.install_cypress
+          if options.install_cypress_with == 'yarn'
+            command = "yarn --cwd=#{install_dir} add cypress --dev"
+          elsif options.install_cypress_with == 'npm'
+            command = "cd #{install_dir}; npm install cypress --save-dev"
+          end
+          if command
+            say command
+            fail 'failed to install cypress' unless system(command)
+          end
         end
         if options.install_cypress_examples
           directory 'spec/cypress/integration/examples', "#{options.cypress_folder}/integration/examples"
@@ -43,19 +46,5 @@ module CypressOnRails
                      "\nimport './on-rails'",
                      after: 'import \'./commands\''
     end
-
-
-    def update_test_rb
-      if File.exist?('config/environments/test.rb')
-        gsub_file 'config/environments/test.rb',
-                  'config.cache_classes = true',
-                  'config.cache_classes = ENV[\'CI\'].present?'
-      end
-      if File.exist?('spec/dummy/config/environments/test.rb')
-        gsub_file 'spec/dummy/config/environments/test.rb',
-                  'config.cache_classes = true',
-                  'config.cache_classes = ENV[\'CI\'].present?'
-      end
-    end
   end
 end

data/lib/generators/cypress_on_rails/templates/config/initializers/cypress_on_rails.rb.erb

@@ -3,7 +3,15 @@ if defined?(CypressOnRails)
     c.cypress_folder = File.expand_path("#{__dir__}/../../<%= options.cypress_folder %>")
     # WARNING!! CypressOnRails can execute arbitrary ruby code
     # please use with extra caution if enabling on hosted servers or starting your local server on 0.0.0.0
-    c.use_middleware = Rails.env.test?
+    c.use_middleware = !Rails.env.production?
     c.logger = Rails.logger
   end
+
+  # # if you compile your asssets on CI
+  # if ENV['CYPRESS'].present? && ENV['CI'].present?
+  #  Rails.application.configure do
+  #    config.assets.compile = false
+  #    config.assets.unknown_asset_fallback = false
+  #  end
+  # end
 end

data/lib/generators/cypress_on_rails/templates/spec/cypress.json

@@ -1,4 +1,4 @@
 {
-  "baseUrl": "http://localhost:5002",
+  "baseUrl": "http://localhost:5017",
   "defaultCommandTimeout": 10000
 }

data/lib/generators/cypress_on_rails/templates/spec/cypress/app_commands/clean.rb

@@ -3,7 +3,7 @@ if defined?(DatabaseCleaner)
   DatabaseCleaner.strategy = :truncation
   DatabaseCleaner.clean
 else
-  logger.warn "add database_cleaner or update clean_db"
+  logger.warn "add database_cleaner or update cypress/app_commands/clean.rb"
   Post.delete_all if defined?(Post)
 end
 

data/lib/generators/cypress_on_rails/templates/spec/cypress/cypress_helper.rb

@@ -1,9 +1,14 @@
 # This is loaded once before the first command is executed
 
 begin
- require 'database_cleaner'
+  require 'database_cleaner-active_record'
 rescue LoadError => e
- puts e.message
+  puts e.message
+  begin
+    require 'database_cleaner'
+  rescue LoadError => e
+    puts e.message
+  end
 end
 
 begin

data/lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/cypress_api.spec.js

@@ -65,7 +65,7 @@ context('Cypress.Cookies', () => {
     // now any cookie with the name 'session_id' will
     // not be cleared before each new test runs
     Cypress.Cookies.defaults({
-      whitelist: 'session_id',
+      preserve: 'session_id',
     })
   })
 })
@@ -84,8 +84,8 @@ context('Cypress.Server', () => {
     Cypress.Server.defaults({
       delay: 0,
       force404: false,
-      whitelist (xhr) {
-        // handle custom logic for whitelisting
+      preserve (xhr) {
+        // handle custom logic for preserving
       },
     })
   })
@@ -112,7 +112,7 @@ context('Cypress.config()', () => {
     let myConfig = Cypress.config()
 
     expect(myConfig).to.have.property('animationDistanceThreshold', 5)
-    expect(myConfig).to.have.property('baseUrl', 'http://localhost:5002')
+    expect(myConfig).to.have.property('baseUrl', 'http://localhost:5017')
     expect(myConfig).to.have.property('defaultCommandTimeout', 10000)
     expect(myConfig).to.have.property('requestTimeout', 5000)
     expect(myConfig).to.have.property('responseTimeout', 30000)

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

data/spec/integrations/cypress.json

@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://localhost:5002",
+  "baseUrl": "http://localhost:5017",
   "defaultCommandTimeout": 10000,
   "projectId": "qvzwep"
 }

data/spec/integrations/rails_3_2/test.sh

@@ -14,14 +14,14 @@ bundle --version
 bundle install --quiet --gemfile="$DIR/Gemfile" --retry 2 --path vendor/bundle
 
 echo '-- cypress install'
-bundle exec ./bin/rails g cypress_on_rails:install --cypress_folder=cypress --install_cypress_with=npm --no-install-cypress-examples
+bundle exec ./bin/rails g cypress_on_rails:install --install_cypress_with=npm
 rm -vf cypress/integration/rails_examples/advance_factory_bot_spec.js
 
 echo '-- start rails server'
 # make sure the server is not running
 (kill -9 `cat tmp/pids/server.pid` || true )
 
-bundle exec ./bin/rails server -p 5002 -e test &
+bundle exec ./bin/rails server -p 5017 -e test &
 sleep 2 # give rails a chance to start up correctly
 
 echo '-- cypress run'

data/spec/integrations/rails_4_2/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.10'
+gem 'rails', '~> 4.2.10'
+gem 'sprockets', '~> 3.7.2'
 
 group :development, :test do
   gem 'cypress-on-rails', path: '../../../'

data/spec/integrations/rails_4_2/test.sh

@@ -14,14 +14,14 @@ bundle --version
 bundle install --quiet --gemfile="$DIR/Gemfile" --retry 2 --path vendor/bundle
 
 echo '-- cypress install'
-bundle exec ./bin/rails g cypress_on_rails:install --no-install-cypress-examples
+bundle exec ./bin/rails g cypress_on_rails:install --cypress_folder=spec/cypress
 rm -vf spec/cypress/integration/rails_examples/advance_factory_bot_spec.js
 
 echo '-- start rails server'
 # make sure the server is not running
 (kill -9 `cat tmp/pids/server.pid` || true )
 
-bundle exec ./bin/rails server -p 5002 -e test &
+bundle exec ./bin/rails server -p 5017 -e test &
 sleep 2 # give rails a chance to start up correctly
 
 echo '-- cypress run'

data/spec/integrations/rails_5_2/Gemfile

@@ -3,6 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.0'
+gem 'sprockets', '~> 3.7.2'
 gem 'sqlite3', '~> 1.3.6'
 
 # Reduces boot times through caching; required in config/boot.rb

data/spec/integrations/rails_5_2/test.sh

@@ -14,7 +14,8 @@ bundle --version
 bundle install --quiet --gemfile="$DIR/Gemfile" --retry 2 --path vendor/bundle
 
 echo '-- migration'
-bin/rails db:migrate
+bundle exec ./bin/rails db:drop || true
+bundle exec ./bin/rails db:create db:migrate
 
 echo '-- cypress install'
 bundle exec ./bin/rails g cypress_on_rails:install --cypress_folder=test/cypress --no-install-cypress-examples
@@ -23,7 +24,7 @@ echo '-- start rails server'
 # make sure the server is not running
 (kill -9 `cat tmp/pids/server.pid` || true )
 
-bundle exec ./bin/rails server -p 5002 -e test &
+bundle exec ./bin/rails server -p 5017 -e test &
 sleep 2 # give rails a chance to start up correctly
 
 echo '-- cypress run'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cypress-on-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.9.0
 platform: ruby
 authors:
 - miceportal team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2021-03-01 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
@@ -75,6 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -284,9 +299,14 @@ files:
 - spec/integrations/rails_5_2/tmp/.keep
 - spec/integrations/rails_5_2/vendor/.keep
 - spec/spec_helper.rb
-homepage: http://github.com/grantspeelman/cypress-on-rails
+homepage: http://github.com/shakacode/cypress-on-rails
 licenses: []
-metadata: {}
+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
+  documentation_uri: https://github.com/shakacode/cypress-on-rails/blob/master/README.md
+  homepage_uri: http://github.com/shakacode/cypress-on-rails
+  source_code_uri: http://github.com/shakacode/cypress-on-rails
 post_install_message: The CypressDev constant is being deprecated and will be completely
   removed and replaced with CypressOnRails.
 rdoc_options: []
@@ -303,8 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.2.11
 signing_key: 
 specification_version: 4
 summary: Integrates cypress with rails or rack applications