cypress-on-rails 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3539179f3a9e5d659797959cb90076cc26fab30195d4692f5c6baa01adf44b0
-  data.tar.gz: d87eca7c08735de0fa4ab81a107e924b2e61d21857df79bd56c92afaca3ac1c9
+  metadata.gz: 423d83b19153f88f90b88295c62934aeb0a20e79cd1e4d700e9a01990972c400
+  data.tar.gz: a5c6a528c074c22ce50206c8120290d9bf12d576348cd033342f593c3efd2d38
 SHA512:
-  metadata.gz: 3059da5ecf3664939b2151609f921a434863725e716606a681bec9f74e677319d9e7a3078830a63262a8805c9584120d0d05f7bce08ad2f7101e2f3363bcf29e
-  data.tar.gz: 032c375f6ed7b145f7f6aa9a496f7d123a346c9efa084936f86f0f0b27cc3ac335c5d2b0bb07015b3a4abc7edfe745fbc2f65fb1b5872bbbfd69c7949acc0b86
+  metadata.gz: 309a6837d21c5cd1814a3b84f9903edcc9d4ddb035f4f0dd8e435640ce16b96e21d51f52b7715d3b88f3f87956143bb53db9434cd151b1c53ba5505316f46cf4
+  data.tar.gz: ec631f2f6a4a48240d1314911076888557da7f24e62ea7b9e0ad50be33f2367fd5581fe09699790a0cd55aa9dbc44d911252284d48e3aee595e5c4765790c91c

data/.gitignore

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

data/.travis.yml

@@ -25,6 +25,6 @@ before_install:
 
 script:
   - bundle exec rake
-  - ./spec/integrations/rails_3_2/test.sh
-  - ./spec/integrations/rails_4_2/test.sh
   - ./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,21 @@
+## [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).
@@ -15,6 +27,8 @@
 * Fix CI by Installing cypress dependencies on Travis CI [PR 31](https://github.com/shakacode/cypress-on-rails/pull/31)
 
 ## [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 +92,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

@@ -31,7 +31,7 @@ group :test, :development do
 end
 ```
 
-The generate the boilerplate code using:
+Generate the boilerplate code using:
 ```
 bin/rails g cypress_on_rails:install
 
@@ -40,6 +40,9 @@ 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:
@@ -99,6 +102,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}`);
+    });
   })
 })
 ```

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

@@ -1,3 +1,3 @@
 module CypressOnRails
-  VERSION = '1.4.2'
+  VERSION = '1.5.0'
 end

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/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/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/integrations/rails_3_2/test.sh

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

data/spec/integrations/rails_4_2/test.sh

@@ -15,6 +15,7 @@ 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
@@ -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/*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cypress-on-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.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: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -127,13 +127,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
@@ -301,8 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integrates cypress with rails or rack applications