cypress-on-rails 1.4.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c3539179f3a9e5d659797959cb90076cc26fab30195d4692f5c6baa01adf44b0
-  data.tar.gz: d87eca7c08735de0fa4ab81a107e924b2e61d21857df79bd56c92afaca3ac1c9
+SHA1:
+  metadata.gz: 7aec96956fcdd7eedf0d5f734cc81e134724c6e5
+  data.tar.gz: 300cecad4faa328db420de5d0a2b598f38f2506a
 SHA512:
-  metadata.gz: 3059da5ecf3664939b2151609f921a434863725e716606a681bec9f74e677319d9e7a3078830a63262a8805c9584120d0d05f7bce08ad2f7101e2f3363bcf29e
-  data.tar.gz: 032c375f6ed7b145f7f6aa9a496f7d123a346c9efa084936f86f0f0b27cc3ac335c5d2b0bb07015b3a4abc7edfe745fbc2f65fb1b5872bbbfd69c7949acc0b86
+  metadata.gz: 6e132c239e673c30b9b4beeeabed6888a05663d3aac596efaa65bfd914f3f3529bf31951e65d3194283f36cd53fd1834e309eb71d5383040fd4135c34beab94e
+  data.tar.gz: 5c34509322e7262d239f5185490c737109e10af613e1e869edec42cc394f792656c598a19b297d93b6026f0d004622416d425b48a71c54c7dfeadc30d90bd8fa

data/.github/FUNDING.yml

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

data/.gitignore

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

data/.travis.yml

@@ -1,6 +1,10 @@
 language: ruby
 rvm:
-  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+#  - 2.7
 
 #addons:
 #  artifacts:
@@ -25,6 +29,8 @@ before_install:
 
 script:
   - bundle exec rake
-  - ./spec/integrations/rails_3_2/test.sh
-  - ./spec/integrations/rails_4_2/test.sh
+  - 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,9 +1,51 @@
+## [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
+
+### Fixed
+* fix FactoryBot Trait not registered error [PR 43](https://github.com/shakacode/cypress-on-rails/pull/43)
+
+## [1.5.0]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.4.2...v1.5.0
+
+### Added
+* Serialize and return responses to be used in tests [PR 34](https://github.com/shakacode/cypress-on-rails/pull/34).
+* Update generator to make it easier to update core generated files [PR 35](https://github.com/shakacode/cypress-on-rails/pull/35).
+
+### Tasks
+* Update integration tests [PR 36](https://github.com/shakacode/cypress-on-rails/pull/36).
+
 ## [1.4.2]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.4.1...v1.4.2
 
 ### Fixed
 * update generator to use full paths for Factory files [PR 33](https://github.com/shakacode/cypress-on-rails/pull/33).
 
 ## [1.4.1]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.4.0...v1.4.1
 
 ### Fixed
 * fix install generator when using npm [PR 22](https://github.com/shakacode/cypress-on-rails/pull/22) by [josephan](https://github.com/josephan).
@@ -14,7 +56,9 @@
 * 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).
 
 ### Changed
@@ -78,10 +122,6 @@
 ## 0.1.2 (2017-10-31)
 * First release.
 
-[Unreleased]: https://github.com/shakacode/cypress-on-rails/compare/v1.4.2...master
-[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

@@ -2,7 +2,13 @@
 
 [![Build Status](https://travis-ci.com/shakacode/cypress-on-rails.svg?branch=master)](https://travis-ci.org/shakacode/cypress-on-rails) [![Gem Version](https://badge.fury.io/rb/cypress-on-rails.svg)](https://badge.fury.io/rb/cypress-on-rails)
 
-Gem for using [cypress.io](http://github.com/cypress-io/) in Rails and ruby rack applications 
+----
+
+This project is sponsored by the software consulting firm [ShakaCode](https://www.shakacode.com), creator of the [React on Rails Gem](https://github.com/shakacode/react_on_rails). We focus on React front-ends, often with Ruby on Rails or Gatsby. The best way to see what we do is to see the details of [our recent work](https://www.shakacode.com/recent-work). Feel free to engage in discussions around this gem at our [forum category for Cypress](https://forum.shakacode.com/c/cypress-on-rails/55).
+
+----
+
+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.
@@ -18,21 +24,21 @@ Has examples of setting up state with:
 * scenarios
 * custom commands
 
-This gem is based off https://github.com/konvenit/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
 
 Add this to your Gemfile:
-```
+
+```ruby
 group :test, :development do
   gem 'cypress-on-rails', '~> 1.0'
 end
 ```
 
-The generate the boilerplate code using:
-```
+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)
@@ -40,19 +46,23 @@ bin/rails g cypress_on_rails:install --cypress_folder=test/cypress
 
 # if you want to install cypress with npm
 bin/rails g cypress_on_rails:install --install_cypress_with=npm
+
+# 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.
 
 ### WARNING
 *WARNING!!:* cypress-on-rails can execute arbitrary ruby code
@@ -62,10 +72,10 @@ Please use with extra caution if starting your local server on 0.0.0.0 or runnin
 
 Start the rails server in test mode and start cypress
 
-```
+```shell
 # start rails
 RAILS_ENV=test bin/rake db:create db:schema:load
-bin/rails server -e test -p 5002
+bin/rails server -e test -p 5017
 
 # in separate window start cypress
 yarn cypress open --project ./spec
@@ -79,10 +89,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
@@ -99,6 +109,11 @@ describe('My First Test', function() {
     cy.visit('/')
 
     cy.contains("Hello World")
+
+    // Accessing result
+    cy.appFactories([['create', 'invoice', { paid: false }]]).then((records) => {
+     cy.visit(`/invoices/${records[0].id}`);
+    });
   })
 })
 ```
@@ -141,7 +156,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:
@@ -163,8 +178,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')`:
@@ -172,7 +187,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('/')
 
@@ -195,7 +210,7 @@ CypressOnRails.configure do |c|
 end
 use CypressOnRails::Middleware
 
-run MyApp 
+run MyApp
 ```
 
 add the following file to cypress

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/middleware.rb

@@ -54,9 +54,17 @@ module CypressOnRails
       logger.info "handle_command: #{body}"
       commands = Command.from_body(body, configuration)
       missing_command = commands.find {|command| !@file.exists?(command.file_path) }
+
       if missing_command.nil?
-        commands.each { |command| @command_executor.load(command.file_path, command.options) }
-        [201, {}, ['success']]
+        results = commands.map { |command| @command_executor.load(command.file_path, command.options) }
+
+        begin
+          output = results.to_json
+        rescue NoMethodError
+          output = {"message" => "Cannot convert to json"}.to_json
+        end
+
+        [201, {'Content-Type' => 'application/json'}, [output]]
       else
         [404, {}, ["could not find command file: #{missing_command.file_path}"]]
       end

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,21 +24,26 @@ 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
 
-    def create(*args)
+    def create(*options)
       load_files
-      factory.create(*args)
+      factory_name = options.shift
+      if options.last.is_a?(Hash)
+        args = options.pop
+      else
+        args = {}
+      end
+      factory.create(factory_name,*options.map(&:to_sym),args.symbolize_keys)
     end
 
     def create_list(*args)
@@ -77,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.4.2'
+  VERSION = '1.8.0'
 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/activerecord_fixtures.rb

@@ -12,6 +12,7 @@ if defined?(ActiveRecord)
   logger.debug "loading fixtures: { dir: #{fixtures_dir}, files: #{fixture_files} }"
   ActiveRecord::FixtureSet.reset_cache
   ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_files)
+  "Fixtures Done" # this gets returned
 else # this else part can be removed
   logger.error "Looks like activerecord_fixtures has to be modified to suite your need"
   Post.create(title: 'MyCypressFixtures')

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/app_commands/factory_bot.rb

@@ -1,4 +1,4 @@
-Array.wrap(command_options).each do |factory_options|
+Array.wrap(command_options).map do |factory_options|
   factory_method = factory_options.shift
   begin
     logger.debug "running #{factory_method}, #{factory_options}"

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

@@ -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/lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/advance_factory_bot_spec.js

@@ -0,0 +1,27 @@
+describe('More Rails using factory bot examples', function() {
+  beforeEach(() => {
+    cy.app('clean') // have a look at cypress/app_commands/clean.rb
+  })
+
+  it('using response from factory bot', function() {
+    cy.appFactories([['create', 'post', { title: 'Good bye Mars'} ]]).then((results) => {
+      const record = results[0];
+
+      cy.visit(`/posts/${record.id}`);
+    });
+    cy.contains("Good bye Mars")
+  })
+
+  it('using response from multiple factory bot', function() {
+    cy.appFactories([
+      ['create', 'post', { title: 'My First Post'} ],
+      ['create', 'post', { title: 'My Second Post'} ]
+    ]).then((results) => {
+      cy.visit(`/posts/${results[0].id}`);
+      cy.contains("My First Post")
+
+      cy.visit(`/posts/${results[1].id}`);
+      cy.contains("My Second Post")
+    });
+  })
+})

data/lib/generators/cypress_on_rails/templates/spec/cypress/support/on-rails.js

@@ -1,29 +1,33 @@
 // CypressOnRails: dont remove these command
 Cypress.Commands.add('appCommands', function (body) {
   cy.log("APP: " + JSON.stringify(body))
-  cy.request({
+  return cy.request({
     method: 'POST',
     url: "/__cypress__/command",
     body: JSON.stringify(body),
     log: true,
     failOnStatusCode: true
-  })
+  }).then((response) => {
+    return response.body
+  });
 });
 
 Cypress.Commands.add('app', function (name, command_options) {
-  cy.appCommands({name: name, options: command_options})
+  return cy.appCommands({name: name, options: command_options}).then((body) => {
+    return body[0]
+  });
 });
 
 Cypress.Commands.add('appScenario', function (name, options = {}) {
-  cy.app('scenarios/' + name, options)
+  return cy.app('scenarios/' + name, options)
 });
 
 Cypress.Commands.add('appEval', function (code) {
-  cy.app('eval', code)
+  return cy.app('eval', code)
 });
 
 Cypress.Commands.add('appFactories', function (options) {
-  cy.app('factory_bot', options)
+  return cy.app('factory_bot', options)
 });
 
 Cypress.Commands.add('appFixtures', function (options) {

data/lib/generators/cypress_on_rails/update_generator.rb

@@ -0,0 +1,13 @@
+module CypressOnRails
+  class UpdateGenerator < Rails::Generators::Base
+    class_option :cypress_folder, type: :string, default: 'spec/cypress'
+    source_root File.expand_path('../templates', __FILE__)
+
+    def update_generated_files
+      template "config/initializers/cypress_on_rails.rb.erb", "config/initializers/cypress_on_rails.rb"
+      copy_file "spec/cypress/cypress_helper.rb", "#{options.cypress_folder}/cypress_helper.rb"
+      copy_file "spec/cypress/support/on-rails.js", "#{options.cypress_folder}/support/on-rails.js"
+      directory 'spec/cypress/app_commands', "#{options.cypress_folder}/app_commands"
+    end
+  end
+end

data/spec/cypress_on_rails/middleware_spec.rb

@@ -16,17 +16,20 @@ RSpec.describe CypressOnRails::Middleware do
 
   context '/__cypress__/command' do
     before do
-      allow(command_executor).to receive(:load)
+      allow(command_executor).to receive(:load).and_return({ id: 1, title: 'some result' })
       allow(file).to receive(:exists?)
       env['PATH_INFO'] = '/__cypress__/command'
     end
 
     it 'command file exists' do
+      allow(command_executor).to receive(:load).and_return({ id: 1, title: 'some result' })
       env['rack.input'] = rack_input(name: 'seed')
       allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
-        expect(response).to eq([201, {}, ['success']])
+        expect(response).to eq([201,
+                                {"Content-Type"=>"application/json"},
+                                ["[{\"id\":1,\"title\":\"some result\"}]"]])
         expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', nil)
       end
     end
@@ -36,18 +39,36 @@ RSpec.describe CypressOnRails::Middleware do
       allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
-        expect(response).to eq([201, {}, ['success']])
+        expect(response).to eq([201,
+                                {"Content-Type"=>"application/json"},
+                                ["[{\"id\":1,\"title\":\"some result\"}]"]])
         expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', ['my_options'])
       end
     end
 
     it 'command file does not exists' do
+      object = BasicObject.new
+      allow(command_executor).to receive(:load).and_return(object)
       env['rack.input'] = rack_input(name: 'seed')
-      allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(false)
+      allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
-        expect(response).to eq([404, {}, ['could not find command file: spec/cypress/app_commands/seed.rb']])
-        expect(command_executor).to_not have_received(:load)
+        expect(response).to eq([201,
+                                {"Content-Type"=>"application/json"},
+                                ["{\"message\":\"Cannot convert to json\"}"]])
+        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', nil)
+      end
+    end
+
+    it 'command result does not respond to to_json' do
+      env['rack.input'] = rack_input(name: 'seed')
+      allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
+
+      aggregate_failures do
+        expect(response).to eq([201,
+                                {"Content-Type"=>"application/json"},
+                                ["[{\"id\":1,\"title\":\"some result\"}]"]])
+        expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/seed.rb', nil)
       end
     end
 
@@ -58,7 +79,9 @@ RSpec.describe CypressOnRails::Middleware do
       allow(file).to receive(:exists?).with('spec/cypress/app_commands/load_sample.rb').and_return(true)
 
       aggregate_failures do
-        expect(response).to eq([201, {}, ['success']])
+        expect(response).to eq([201,
+                                {"Content-Type"=>"application/json"},
+                                ["[{\"id\":1,\"title\":\"some result\"},{\"id\":1,\"title\":\"some result\"}]"]])
         expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/load_user.rb', nil)
         expect(command_executor).to have_received(:load).with('spec/cypress/app_commands/load_sample.rb', {'all' => 'true'})
       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
@@ -43,7 +44,22 @@ RSpec.describe CypressOnRails::SmartFactoryWrapper do
 
   it 'it sends delegates create to the factory' do
     subject.create(:user)
-    expect(factory_double).to have_received(:create).with(:user)
+    expect(factory_double).to have_received(:create).with(:user, {})
+  end
+
+  it 'it sends delegates create to the factory and symbolize keys' do
+    subject.create(:user, {'name' => "name"})
+    expect(factory_double).to have_received(:create).with(:user, {name: 'name'})
+  end
+
+  it 'it sends delegates create to the factory and symbolize keys with trait' do
+    subject.create(:user, 'trait1', {'name' => "name"})
+    expect(factory_double).to have_received(:create).with(:user, :trait1, {name: 'name'})
+  end
+
+  it 'it sends delegates create to the factory and symbolize keys with only trait' do
+    subject.create(:user, 'trait2')
+    expect(factory_double).to have_received(:create).with(:user, :trait2, {})
   end
 
   it 'it sends delegates create_list to the factory' do
@@ -53,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
@@ -64,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
@@ -76,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

@@ -15,12 +15,13 @@ 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
+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

@@ -15,12 +15,13 @@ 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
+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'
@@ -33,6 +34,5 @@ else
     yarn run cypress run --record
 fi
 
-
 echo '-- stop rails server'
 kill -9 `cat ../tmp/pids/server.pid`

data/spec/integrations/rails_5_2/.gitignore

@@ -6,7 +6,7 @@ test/yarn.lock
 test/cypress/
 config/initializers/cypress_on_rails.rb
 vendor/bundle
-tmp/pids
 db/*.sqlite3
 db/schema.rb
-tmp/cache
+tmp/*
+log/*

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

@@ -23,7 +23,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.4.2
+  version: 1.8.0
 platform: ruby
 authors:
 - miceportal team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 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
@@ -75,6 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -127,13 +142,15 @@ files:
 - lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/viewport.spec.js
 - lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/waiting.spec.js
 - lib/generators/cypress_on_rails/templates/spec/cypress/integration/examples/window.spec.js
+- lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/advance_factory_bot_spec.js
 - lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/other_spec.js
-- lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/using_factory_bot.js
-- lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/using_fixtures.js
+- lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/using_factory_bot_spec.js
+- lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/using_fixtures_spec.js
 - lib/generators/cypress_on_rails/templates/spec/cypress/integration/rails_examples/using_scenarios_spec.js
 - lib/generators/cypress_on_rails/templates/spec/cypress/support/commands.js
 - lib/generators/cypress_on_rails/templates/spec/cypress/support/index.js
 - lib/generators/cypress_on_rails/templates/spec/cypress/support/on-rails.js
+- lib/generators/cypress_on_rails/update_generator.rb
 - spec/cypress_on_rails/command_executor/cypress_helper.rb
 - spec/cypress_on_rails/command_executor/test_command.rb
 - spec/cypress_on_rails/command_executor/test_command_with_options.rb
@@ -282,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: []
@@ -302,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Integrates cypress with rails or rack applications