cypress-on-rails 1.16.0 → 1.17.0

data/specs_e2e/rails_4_2/spec/fixtures/vcr_cassettes/cats.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cat-fact.herokuapp.com/facts
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Host:
+      - cat-fact.herokuapp.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Cowboy
+      Report-To:
+      - '{"group":"heroku-nel","max_age":3600,"endpoints":[{"url":"https://nel.heroku.com/reports?ts=1704261545&sid=929419e7-33ea-4e2f-85f0-7d8b7cd5cbd6&s=OabIZbJae2naQpkmA6oM8tyC0dn4yWUtvOVjuyytaRg%3D"}]}'
+      Reporting-Endpoints:
+      - heroku-nel=https://nel.heroku.com/reports?ts=1704261545&sid=929419e7-33ea-4e2f-85f0-7d8b7cd5cbd6&s=OabIZbJae2naQpkmA6oM8tyC0dn4yWUtvOVjuyytaRg%3D
+      Nel:
+      - '{"report_to":"heroku-nel","max_age":3600,"success_fraction":0.005,"failure_fraction":0.05,"response_headers":["Via"]}'
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - Express
+      Access-Control-Allow-Origin:
+      - "*"
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '1877'
+      Etag:
+      - W/"755-h8iGk8b461dj2B2tvSoMjrc8cAA"
+      Set-Cookie:
+      - connect.sid=s%3ASQfrvsPQGDLjbr1QrsrgV8BwZQptae4i.6BlC7zySZLgqSg%2BRmO6edW%2FxM6WR%2FJ9Xz2lD16D4nWo;
+        Path=/; HttpOnly
+      Date:
+      - Wed, 03 Jan 2024 05:59:05 GMT
+      Via:
+      - 1.1 vegur
+    body:
+      encoding: UTF-8
+      string: '[{"status":{"verified":true,"sentCount":1},"_id":"58e00b5f0aac31001185ed24","user":"58e007480aac31001185ecef","text":"When
+        asked if her husband had any hobbies, Mary Todd Lincoln is said to have replied
+        \"cats.\"","__v":0,"source":"user","updatedAt":"2020-08-23T20:20:01.611Z","type":"cat","createdAt":"2018-02-19T21:20:03.434Z","deleted":false,"used":false},{"status":{"verified":true,"feedback":"","sentCount":1},"_id":"5887e1d85c873e0011036889","user":"5a9ac18c7478810ea6c06381","text":"Cats
+        make about 100 different sounds. Dogs make only about 10.","__v":0,"source":"user","updatedAt":"2020-09-03T16:39:39.578Z","type":"cat","createdAt":"2018-01-15T21:20:00.003Z","deleted":false,"used":true},{"status":{"verified":true,"sentCount":1},"_id":"58e008780aac31001185ed05","user":"58e007480aac31001185ecef","text":"Owning
+        a cat can reduce the risk of stroke and heart attack by a third.","__v":0,"source":"user","updatedAt":"2020-08-23T20:20:01.611Z","type":"cat","createdAt":"2018-03-29T20:20:03.844Z","deleted":false,"used":false},{"status":{"verified":true,"sentCount":1},"_id":"58e009390aac31001185ed10","user":"58e007480aac31001185ecef","text":"Most
+        cats are lactose intolerant, and milk can cause painful stomach cramps and
+        diarrhea. It''s best to forego the milk and just give your cat the standard:
+        clean, cool drinking water.","__v":0,"source":"user","updatedAt":"2020-08-23T20:20:01.611Z","type":"cat","createdAt":"2018-03-04T21:20:02.979Z","deleted":false,"used":false},{"status":{"verified":true,"sentCount":1},"_id":"58e00af60aac31001185ed1d","user":"58e007480aac31001185ecef","text":"It
+        was illegal to slay cats in ancient Egypt, in large part because they provided
+        the great service of controlling the rat population.","__v":0,"source":"user","updatedAt":"2020-09-16T20:20:04.164Z","type":"cat","createdAt":"2018-01-15T21:20:02.945Z","deleted":false,"used":true}]'
+  recorded_at: Wed, 03 Jan 2024 05:59:06 GMT
+recorded_with: VCR 6.0.0

data/specs_e2e/rails_4_2/test.sh

@@ -14,15 +14,15 @@ gem install bundler -v "~> 1.0" --conservative
 bundle --version
 bundle install --quiet --gemfile="$DIR/Gemfile" --retry 2 --path vendor/bundle
 
-echo '-- cypress and playwright install'
-bundle exec ./bin/rails g cypress_on_rails:install --install_folder=spec/e2e --cypress_folder=spec/cypress --playwright_folder=spec/playwright --install_cypress --install_playwright --experimental --install_with=npm --skip
+echo '-- cypress install'
+bundle exec ./bin/rails g cypress_on_rails:install --install_folder=spec --framework cypress --experimental --install_with=npm --force
 rm -vf spec/cypress/e2e/rails_examples/advance_factory_bot.cy.js
 
 echo '-- start rails server'
 # make sure the server is not running
-(kill -9 `cat tmp/pids/server.pid` || true )
+(kill -9 `cat ../server.pid` || true )
 
-bundle exec ./bin/rails server -p 5017 -e test &
+bundle exec ./bin/rails server -p 5017 -e test -P ../server.pid &
 sleep 5 # give rails a chance to start up correctly
 
 echo '-- cypress run'
@@ -31,14 +31,20 @@ cp -fv ../cypress.config.js spec/
 # then
 #     npx cypress run -P ./spec
 # else
-    npx cypress run -P ./spec --record
+    npx cypress install
+    npx cypress run -P ./spec # --record
 # fi
 
+echo '-- playwright install'
+bundle exec ./bin/rails g cypress_on_rails:install --install_folder=spec --framework playwright --experimental --install_with=npm --force
+rm -vf spec/playwright/e2e/rails_examples/advance_factory_bot.cy.js
+
 echo '-- playwright run'
 cp -fv ../playwright.config.js spec/
 cd spec
 npx playwright install-deps
-npx playwright test spec/playwright/e2e/
+npx playwright install
+npx playwright test spec/playwright/e2e
 
 echo '-- stop rails server'
-kill -9 `cat tmp/pids/server.pid` || true
+kill -9 `cat ../../server.pid` || true

data/specs_e2e/rails_5_2/.gitignore

@@ -1,12 +1,16 @@
 .bundle
 test/node_modules
 test/cypress.config.js
+test/playwright.config.js
 test/package.json
 test/yarn.lock
 test/cypress/
+test/playwright/
+test/playwright-report/
 config/initializers/cypress_on_rails.rb
 vendor/bundle
 db/*.sqlite3
 db/schema.rb
 tmp/*
 log/*
+specs_e2e/server.pid

data/specs_e2e/rails_5_2/test.sh

@@ -18,31 +18,40 @@ echo '-- migration'
 bundle exec ./bin/rails db:drop || true
 bundle exec ./bin/rails db:create db:migrate
 
-echo '-- cypress and playwright install'
-bundle exec ./bin/rails g cypress_on_rails:install --install_folder=test/e2e --cypress_folder=test/cypress --playwright_folder=test/playwright --install_cypress --install_playwright --install_with=npm --skip
+echo '-- cypress install'
+bundle exec ./bin/rails g cypress_on_rails:install --install_folder=test --framework cypress --install_with=npm --force
 rm -vf test/cypress/e2e/rails_examples/using_vcr.cy.js
 
 echo '-- start rails server'
 # make sure the server is not running
-(kill -9 `cat tmp/pids/server.pid` || true )
+(kill -9 `cat ../server.pid` || true )
 
-bundle exec ./bin/rails server -p 5017 -e test &
+bundle exec ./bin/rails server -p 5017 -e test -P ../server.pid &
 sleep 2 # give rails a chance to start up correctly
 
 echo '-- cypress run'
 cp -fv ../cypress.config.js test/
 cd test
+npx cypress install
 # if [ -z $CYPRESS_RECORD_KEY ]
 # then
 #     npx cypress run
 # else
-    npx cypress run --record
+    npx cypress run # --record
 # fi
 
+echo '-- playwright install'
+cd ..
+bundle exec ./bin/rails g cypress_on_rails:install --install_folder=test --framework playwright --install_with=npm --force
+rm -vf test/playwright/e2e/rails_examples/using_vcr.cy.js
+
 echo '-- playwright run'
+cd test
 cp -fv ../../playwright.config.js .
 npx playwright install-deps
-npx playwright test test/playwright/e2e/
+npx playwright install
+npx playwright test test/playwright
+# npx playwright show-report
 
 echo '-- stop rails server'
-kill -9 `cat ../tmp/pids/server.pid` || true
+kill -9 `cat ../../server.pid` || true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cypress-on-rails
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - miceportal team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2024-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -71,16 +71,16 @@ dependencies:
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "!="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.4.5
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,6 @@ files:
 - lib/generators/cypress_on_rails/templates/spec/playwright/e2e/rails_examples/using_scenarios.spec.js
 - lib/generators/cypress_on_rails/templates/spec/playwright/support/index.js.erb
 - lib/generators/cypress_on_rails/templates/spec/playwright/support/on-rails.js
-- lib/generators/cypress_on_rails/update_generator.rb
 - plugin/.gitignore
 - plugin/cypress/plugins/index.js
 - plugin/package.json
@@ -244,12 +243,14 @@ files:
 - specs_e2e/rails_4_2/config/routes.rb
 - specs_e2e/rails_4_2/config/secrets.yml
 - specs_e2e/rails_4_2/package.json
+- specs_e2e/rails_4_2/playwright-report/index.html
 - specs_e2e/rails_4_2/public/404.html
 - specs_e2e/rails_4_2/public/422.html
 - specs_e2e/rails_4_2/public/500.html
 - specs_e2e/rails_4_2/public/favicon.ico
 - specs_e2e/rails_4_2/public/robots.txt
 - specs_e2e/rails_4_2/spec/.keep
+- specs_e2e/rails_4_2/spec/fixtures/vcr_cassettes/cats.yml
 - specs_e2e/rails_4_2/test.sh
 - specs_e2e/rails_4_2/vendor/.keep
 - specs_e2e/rails_5_2/.gitignore

data/lib/generators/cypress_on_rails/update_generator.rb

@@ -1,24 +0,0 @@
-module CypressOnRails
-  class UpdateGenerator < Rails::Generators::Base
-    class_option :install_folder, type: :string, default: 'spec/e2e'
-    class_option :install_cypress, type: :boolean, default: true
-    class_option :install_playwright, type: :boolean, default: false
-    class_option :install_with, type: :string, default: 'yarn'
-    class_option :cypress_folder, type: :string, default: 'spec/cypress'
-    class_option :playwright_folder, type: :string, default: 'spec/playwright'
-    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"
-      template "spec/e2e/e2e_helper.rb.erb", "#{options.install_folder}/e2e_helper.rb"
-      directory 'spec/e2e/app_commands', "#{options.install_folder}/app_commands"
-
-      if options.install_cypress
-        copy_file "spec/cypress/support/on-rails.js", "#{options.cypress_folder}/support/on-rails.js"
-      end
-      if options.install_playwright
-        copy_file "spec/playwright/support/on-rails.js", "#{options.playwright_folder}/support/on-rails.js"
-      end
-    end
-  end
-end