cypress-on-rails 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49942b0febcf64950936386fdbcbec0601534923
-  data.tar.gz: dba819774cec41583fb545fe2517a9baceaf029a
+  metadata.gz: c704c33fe50fb989eaf131934d0210c112005e96
+  data.tar.gz: b53f4ce2fea91a67744f0432a736dd1021fb3c7d
 SHA512:
-  metadata.gz: dd5ab5135eeec0405b53356e5205956a5ea2f7230341663ac206b76292eb895eef297a96e28345f94dd78ffc8cbda2c54ac0b408dec097dc18edfb760da2ef53
-  data.tar.gz: ca4fb0a7f72ad6341fcb3c14aa22b6142ed95ffa3a77a5e6e229eeb3fc0d6e9290bb67edec65edb99ecae093044b4a795dc1611c6c5b193e764dcc76a1072e71
+  metadata.gz: 9f5bff901ec22f23d785eb19597b07fce18ecd87bea209464ce4bc9de4f6ce2238bd5f760f02d98443aa540e32147be1b06cc2dbc33e105d31364c8cfb4c7d91
+  data.tar.gz: 01c2e5fb7d24cac595e56e1ed24e4b0ed0643715dd4f51b11056806f456867bd2d72dd1cf15c5e583f1d3543ca131eda5783faa15fb9f6be0060134fdb15ae65

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
   - 2.3
+  - 2.4
   - 2.5
   - 2.6
+#  - 2.7
 
 #addons:
 #  artifacts:
@@ -27,6 +29,8 @@ before_install:
 
 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,12 @@
+## [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 +41,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).

data/README.md

@@ -8,7 +8,7 @@ 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 
+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,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
 ```
 
 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)
@@ -51,17 +51,18 @@ bin/rails g cypress_on_rails:install --install_cypress_with=npm
 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
@@ -71,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
@@ -88,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
@@ -108,9 +109,9 @@ describe('My First Test', function() {
     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 +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:
@@ -177,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')`:
@@ -186,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('/')
 
@@ -209,7 +210,7 @@ CypressOnRails.configure do |c|
 end
 use CypressOnRails::Middleware
 
-run MyApp 
+run MyApp
 ```
 
 add the following file to cypress

data/lib/cypress_on_rails/version.rb

@@ -1,3 +1,3 @@
 module CypressOnRails
-  VERSION = '1.5.1'
+  VERSION = '1.6.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/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/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/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

@@ -21,7 +21,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'

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

@@ -21,7 +21,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'

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.5.1
+  version: 1.6.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: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack