cypress-on-rails 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8019daab6920154502f30e3a0bc5acb508d3e54cb7befe5274442b70724e02
-  data.tar.gz: 626901503a647087b14785b8d0df09c1033a01be4cf4f8456beeed376880f5a8
+  metadata.gz: 177b927f449263bee75b6df1264121d3786b42b84f628774d132ab16e9bd2661
+  data.tar.gz: 1bf70138742d1a0c5cb4e0251196a4b1ac01757d657f8afdb5a66d59c8b08360
 SHA512:
-  metadata.gz: 7379070d5df5642e4d9c45dcd3b935784278b409dde546dd9d8e334d54c473f5b3daf1b0061edc9dcabf2b15d3e1b0a6cf4fb9e75ce7d3bf2bf527f0af29dd85
-  data.tar.gz: 65dde5afa09ef3a862a19928cd76ead9c5f2755c4c15d22c3b978882ae58393ffbbe8799c4e1e6641301fcd20bb82342220029679443249bf8f1671b91c25c83
+  metadata.gz: c853ec1f0a8859a9ceb10bcc5574dcbc4a0cccf92410082bdeb571d5730cefa6ebec1f67ee7ffd0ca1f2f4d52a0c3c13207b72dbae138f80356ad8eaae8d7afa
+  data.tar.gz: b7bba0522ca422efc3de8fbed04d44cd9e4d4662a8fde0a504284f9a8fe304f2ab2e7256a737789fc855360d49c2f43b071021938019482c9dd166f4315481ed

data/.github/workflows/ruby.yml

@@ -0,0 +1,57 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  rails_3_2:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.3
+        bundler-cache: true 
+    - name: Run tests
+      run: bundle exec rake
+    - run: gem uninstall -v '>= 2' -ax bundler || true
+    - run: gem install bundler -v '< 2'
+    - name: Run interaction tests
+      run: ./spec/integrations/rails_3_2/test.sh
+
+  rails_4_2:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.5
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake
+    - run: gem uninstall -v '>= 2' -ax bundler || true
+    - run: gem install bundler -v '< 2'
+    - name: Run interaction tests
+      run: ./spec/integrations/rails_4_2/test.sh
+
+  rails_5_2:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+        bundler-cache: true 
+    - name: Run tests
+      run: bundle exec rake
+    - name: Run interaction tests
+      run: ./spec/integrations/rails_5_2/test.sh

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.12.0]
+[Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.11.0...v1.12.0
+
+### Changed
+* only reload factories on clean instead of every factory create request [PR 95](https://github.com/shakacode/cypress-on-rails/pull/95)
+* alternative command added for get tail of logs [PR 89](https://github.com/shakacode/cypress-on-rails/pull/89) by [ccrockett]
+
+### Tasks
+* switch from travis to github actions [PR 96]
+
 ## [1.11.0]
 [Compare]: https://github.com/shakacode/cypress-on-rails/compare/v1.10.1...v1.11.0
 

data/README.md

@@ -1,6 +1,7 @@
 # CypressOnRails
 
-[![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)
+![Build Status](https://github.com/shakacode/cypress-on-rails/actions/workflows/ruby.yml/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/cypress-on-rails.svg)](https://badge.fury.io/rb/cypress-on-rails)
 
 ----
 

data/lib/cypress_on_rails/middleware.rb

@@ -53,7 +53,7 @@ module CypressOnRails
       body = JSON.parse(req.body.read)
       logger.info "handle_command: #{body}"
       commands = Command.from_body(body, configuration)
-      missing_command = commands.find {|command| !@file.exists?(command.file_path) }
+      missing_command = commands.find {|command| !@file.exist?(command.file_path) }
 
       if missing_command.nil?
         begin

data/lib/cypress_on_rails/smart_factory_wrapper.rb

@@ -27,6 +27,10 @@ module CypressOnRails
       instance.build_list(*args)
     end
 
+    def self.reload
+      instance.reload
+    end
+
     # @return [Array]
     attr_accessor :factory
     attr_accessor :always_reload
@@ -44,7 +48,7 @@ module CypressOnRails
     end
 
     def create(*options)
-      load_files
+      auto_reload
       factory_name = options.shift
       if options.last.is_a?(Hash)
         args = options.pop
@@ -55,12 +59,12 @@ module CypressOnRails
     end
 
     def create_list(*args)
-      load_files
+      auto_reload
       factory.create_list(*args)
     end
 
     def build(*options)
-      load_files
+      auto_reload
       factory_name = options.shift
       if options.last.is_a?(Hash)
         args = options.pop
@@ -71,10 +75,19 @@ module CypressOnRails
     end
 
     def build_list(*args)
-      load_files
+      auto_reload
       factory.build_list(*args)
     end
 
+    def reload
+      logger.info 'Loading Factories'
+      factory.reload
+      files.each do |file|
+        logger.debug "-- Loading: #{file}"
+        @kernel.load(file)
+      end 
+    end
+
     private
 
     # @param [String,Array] arg
@@ -92,16 +105,11 @@ module CypressOnRails
       CypressOnRails.configuration.logger
     end
 
-    def load_files
+    def auto_reload
       current_latest_mtime = files.map{|file| @file_system.mtime(file) }.max
       return unless should_reload?(current_latest_mtime)
-      logger.info 'Loading Factories'
       @latest_mtime = current_latest_mtime
-      factory.reload
-      files.each do |file|
-        logger.debug "-- Loading: #{file}"
-        @kernel.load(file)
-      end
+      reload
     end
 
     def should_reload?(current_latest_mtime)

data/lib/cypress_on_rails/version.rb

@@ -1,3 +1,3 @@
 module CypressOnRails
-  VERSION = '1.11.0'.freeze
+  VERSION = '1.12.0'.freeze
 end

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

@@ -7,4 +7,6 @@ else
   Post.delete_all if defined?(Post)
 end
 
+CypressOnRails::SmartFactoryWrapper.reload
+
 Rails.logger.info "APPCLEANED" # used by log_fail.rb

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

@@ -3,6 +3,8 @@ filename = command_options.fetch('runnable_full_title', 'no title').gsub(/[^[:pr
 
 # grab last lines until "APPCLEANED" (Make sure in clean.rb to log the text "APPCLEANED")
 system "tail -n 10000 -r log/#{Rails.env}.log | sed \"/APPCLEANED/ q\" | sed 'x;1!H;$!d;x' > 'log/#{filename}.log'"
+# Alternative command if the above does not work
+# system "tail -n 10000 log/#{Rails.env}.log | tac | sed \"/APPCLEANED/ q\" | sed 'x;1!H;$!d;x' > 'log/#{filename}.log'"
 
 # create a json debug file for server debugging
 json_result = {}

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

@@ -29,7 +29,7 @@ factory = FactoryBot if defined?(FactoryBot)
 factory = FactoryGirl if defined?(FactoryGirl)
 
 CypressOnRails::SmartFactoryWrapper.configure(
-    always_reload: !Rails.configuration.cache_classes,
+    always_reload: false,
     factory: factory,
     files: [
       Rails.root.join('spec', 'factories.rb'),

data/spec/cypress_on_rails/middleware_spec.rb

@@ -17,14 +17,14 @@ RSpec.describe CypressOnRails::Middleware do
   context '/__cypress__/command' do
     before do
       allow(command_executor).to receive(:perform).and_return({ id: 1, title: 'some result' })
-      allow(file).to receive(:exists?)
+      allow(file).to receive(:exist?)
       env['PATH_INFO'] = '/__cypress__/command'
     end
 
-    it 'command file exists' do
+    it 'command file exist' do
       allow(command_executor).to receive(:perform).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)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
         expect(response).to eq([201,
@@ -34,9 +34,9 @@ RSpec.describe CypressOnRails::Middleware do
       end
     end
 
-    it 'command file exists with options' do
+    it 'command file exist with options' do
       env['rack.input'] = rack_input(name: 'seed', options: ['my_options'])
-      allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
         expect(response).to eq([201,
@@ -46,11 +46,11 @@ RSpec.describe CypressOnRails::Middleware do
       end
     end
 
-    it 'command file does not exists' do
+    it 'command file does not exist' do
       object = BasicObject.new
       allow(command_executor).to receive(:perform).and_return(object)
       env['rack.input'] = rack_input(name: 'seed')
-      allow(file).to receive(:exists?).with('spec/cypress/app_commands/seed.rb').and_return(true)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
         expect(response).to eq([201,
@@ -62,7 +62,7 @@ RSpec.describe CypressOnRails::Middleware do
 
     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)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/seed.rb').and_return(true)
 
       aggregate_failures do
         expect(response).to eq([201,
@@ -75,8 +75,8 @@ RSpec.describe CypressOnRails::Middleware do
     it 'running multiple commands' do
       env['rack.input'] = rack_input([{name: 'load_user'},
                                       {name: 'load_sample', options: {'all' => 'true'}}])
-      allow(file).to receive(:exists?).with('spec/cypress/app_commands/load_user.rb').and_return(true)
-      allow(file).to receive(:exists?).with('spec/cypress/app_commands/load_sample.rb').and_return(true)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/load_user.rb').and_return(true)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/load_sample.rb').and_return(true)
 
       aggregate_failures do
         expect(response).to eq([201,
@@ -89,8 +89,8 @@ RSpec.describe CypressOnRails::Middleware do
 
     it 'running multiple commands but one missing' do
       env['rack.input'] = rack_input([{name: 'load_user'}, {name: 'load_sample'}])
-      allow(file).to receive(:exists?).with('spec/cypress/app_commands/load_user.rb').and_return(true)
-      allow(file).to receive(:exists?).with('spec/cypress/app_commands/load_sample.rb').and_return(false)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/load_user.rb').and_return(true)
+      allow(file).to receive(:exist?).with('spec/cypress/app_commands/load_sample.rb').and_return(false)
 
       aggregate_failures do
         expect(response).to eq([404, {}, ['could not find command file: spec/cypress/app_commands/load_sample.rb']])

data/spec/cypress_on_rails/smart_factory_wrapper_spec.rb

@@ -140,6 +140,13 @@ RSpec.describe CypressOnRails::SmartFactoryWrapper do
     expect(kernel_double).to have_received(:load).with('file2.rb').twice
   end
 
+  it 'can manually reload' do
+    subject.reload
+    expect(factory_double).to have_received(:reload)
+    expect(kernel_double).to have_received(:load).with('file1.rb')
+    expect(kernel_double).to have_received(:load).with('file2.rb')
+  end
+
   context 'files is a string' do
     let(:files) { 'file*.rb' }
 

data/spec/integrations/rails_3_2/test.sh

@@ -4,9 +4,9 @@ set -eo pipefail
 echo '--- testing rails 3.2'
 
 echo '-- setting environment'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-RAILS_ENV=test
-BUNDLE_GEMFILE="$DIR/Gemfile"
+export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export RAILS_ENV=test
+export BUNDLE_GEMFILE="$DIR/Gemfile"
 cd $DIR
 
 echo '-- bundle install'

data/spec/integrations/rails_4_2/test.sh

@@ -4,9 +4,9 @@ set -eo pipefail
 echo '--- testing rails 4.2'
 
 echo '-- setting environment'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-RAILS_ENV=test
-BUNDLE_GEMFILE="$DIR/Gemfile"
+export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export RAILS_ENV=test
+export BUNDLE_GEMFILE="$DIR/Gemfile"
 cd $DIR
 
 echo '-- bundle install'

data/spec/integrations/rails_5_2/test.sh

@@ -4,14 +4,15 @@ set -eo pipefail
 echo '--- testing rails 5.2'
 
 echo '-- setting environment'
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-RAILS_ENV=test
-BUNDLE_GEMFILE="$DIR/Gemfile"
+export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export RAILS_ENV=test
+export BUNDLE_GEMFILE="$DIR/Gemfile"
 cd $DIR
 
 echo '-- bundle install'
 bundle --version
-bundle install --quiet --gemfile="$DIR/Gemfile" --retry 2 --path vendor/bundle
+bundle config set --local path 'vendor/bundle'
+bundle install --quiet --gemfile="$DIR/Gemfile" --retry 2
 
 echo '-- migration'
 bundle exec ./bin/rails db:drop || true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cypress-on-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - miceportal team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -90,9 +90,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE

data/.travis.yml

@@ -1,39 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-#  - 2.7
-
-#addons:
-#  artifacts:
-#    s3_region: "ap-southeast-2"
-#    paths:
-#      - $(ls spec/integrations/*/*/cypress/{screenshots,videos}/* | tr "\n" ":")
-#      - $(ls spec/integrations/rails_3_2/cypress/{screenshots,videos}/* | tr "\n" ":")
-
-cache:
-  directories:
-    - spec/integrations/rails_5_2/spec/node_modules
-    - spec/integrations/rails_5_2/vendor/bundle
-    - spec/integrations/rails_4_2/test/node_modules
-    - spec/integrations/rails_4_2/vendor/bundle
-    - spec/integrations/rails_3_2/node_modules
-    - spec/integrations/rails_3_2/vendor/bundle
-
-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