Skip to content

Commit 8fc3cfa

Browse files
committed
Rename CypressDev to CypressOnRails
1 parent 7813350 commit 8fc3cfa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+97
-91
lines changed

CHANGELOG.md

+4

README.md

+10-10

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require 'bundler/gem_tasks'
33

44
require 'rspec/core/rake_task'
55
RSpec::Core::RakeTask.new(:spec) do |t|
6-
t.pattern = 'spec/cypress/*_spec.rb'
6+
t.pattern = 'spec/cypress_on_rails/*_spec.rb'
77
end
88

99
task default: %w[spec build]

cypress-on-rails.gemspec

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# -*- encoding: utf-8 -*-
22
$LOAD_PATH.push File.expand_path("../lib", __FILE__)
3-
require "cypress_dev/version"
3+
require "cypress_on_rails/version"
44

55
Gem::Specification.new do |s|
66
s.name = "cypress-on-rails"
7-
s.version = CypressDev::VERSION
7+
s.version = CypressOnRails::VERSION
88
s.author = ["miceportal team", 'Grant Petersen-Speelman']
99
1010
s.homepage = "http://github.com/grantspeelman/cypress-on-rails"
1111
s.summary = "Integrates cypress with rails or rack applications"
1212
s.description = "Integrates cypress with rails or rack applications"
13+
s.post_install_message = 'The CypressDev constant is being deprecated and will be completely removed and replaced with CypressOnRails'
1314
s.rubyforge_project = s.name
1415
s.files = `git ls-files`.split("\n")
1516
s.test_files = `git ls-files -- {spec}/*`.split("\n")

lib/cypress-on-rails.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
require 'cypress_dev'
1+
require 'cypress_on_rails/version'
2+
require 'cypress_on_rails/configuration'
3+
require_relative './cypress_on_rails/railtie' if defined?(Rails)
24

5+
# maintain backward compatibility
6+
CypressDev = CypressOnRails
37
Cypress = CypressDev

lib/cypress/smart_factory_wrapper.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
require 'cypress-on-rails'
2-
require 'cypress_dev/smart_factory_wrapper'
2+
require 'cypress_on_rails/smart_factory_wrapper'
33
# for backward compatibility

lib/cypress_dev.rb

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
require 'cypress_dev/version'
2-
require 'cypress_dev/configuration'
3-
require_relative './cypress_dev/railtie' if defined?(Rails)
4-
1+
require 'cypress-on-rails'

lib/cypress_dev/version.rb

-3
This file was deleted.

lib/cypress_dev/command_executor.rb lib/cypress_on_rails/command_executor.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require 'cypress_dev/configuration'
1+
require 'cypress_on_rails/configuration'
22

3-
module CypressDev
3+
module CypressOnRails
44
# loads and evals the command files
55
class CommandExecutor
66
def self.load(file,command_options = nil)
@@ -27,7 +27,7 @@ def self.logger
2727
end
2828

2929
def self.configuration
30-
CypressDev.configuration
30+
CypressOnRails.configuration
3131
end
3232
end
3333
end

lib/cypress_dev/configuration.rb lib/cypress_on_rails/configuration.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'logger'
22

3-
module CypressDev
3+
module CypressOnRails
44
class Configuration
55
attr_accessor :cypress_folder
66
attr_accessor :use_middleware

lib/cypress_dev/middleware.rb lib/cypress_on_rails/middleware.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
require 'json'
22
require 'rack'
3-
require 'cypress_dev/configuration'
4-
require 'cypress_dev/command_executor'
3+
require 'cypress_on_rails/configuration'
4+
require 'cypress_on_rails/command_executor'
55

6-
module CypressDev
6+
module CypressOnRails
77
# Middleware to handle cypress commands and eval
88
class Middleware
99
def initialize(app, command_executor = CommandExecutor, file = ::File)
@@ -24,7 +24,7 @@ def call(env)
2424
private
2525

2626
def configuration
27-
CypressDev.configuration
27+
CypressOnRails.configuration
2828
end
2929

3030
def logger

lib/cypress_dev/railtie.rb lib/cypress_on_rails/railtie.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
require 'rails/railtie'
2-
require 'cypress_dev/configuration'
3-
require 'cypress_dev/middleware'
2+
require 'cypress_on_rails/configuration'
3+
require 'cypress_on_rails/middleware'
44

5-
module CypressDev
5+
module CypressOnRails
66
class Railtie < Rails::Railtie
77
initializer :setup_cypress_middleware do |app|
8-
if CypressDev.configuration.use_middleware?
8+
if CypressOnRails.configuration.use_middleware?
99
app.middleware.use Middleware
1010
end
1111
end

lib/cypress_dev/simple_rails_factory.rb lib/cypress_on_rails/simple_rails_factory.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'active_support/core_ext/string'
22

3-
module CypressDev
3+
module CypressOnRails
44
module SimpleRailsFactory
55
def self.create(type, *params)
66
params = [{}] if params.empty?

lib/cypress_dev/smart_factory_wrapper.rb lib/cypress_on_rails/smart_factory_wrapper.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
require 'cypress_dev/configuration'
2-
require 'cypress_dev/simple_rails_factory'
1+
require 'cypress_on_rails/configuration'
2+
require 'cypress_on_rails/simple_rails_factory'
33

4-
module CypressDev
4+
module CypressOnRails
55
class SmartFactoryWrapper
66
module FactoryCleaner
77
def self.clean(f = FactoryBot)
@@ -69,7 +69,7 @@ def files
6969
end
7070

7171
def logger
72-
CypressDev.configuration.logger
72+
CypressOnRails.configuration.logger
7373
end
7474

7575
def load_files

lib/cypress_on_rails/version.rb

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module CypressOnRails
2+
VERSION = '1.4.0'
3+
end

lib/generators/cypress_dev/install_generator.rb lib/generators/cypress_on_rails/install_generator.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module CypressDev
1+
module CypressOnRails
22
class InstallGenerator < Rails::Generators::Base
33
class_option :cypress_folder, type: :string, default: 'spec/cypress'
44
class_option :install_cypress_with, type: :string, default: 'yarn'
@@ -31,7 +31,7 @@ def install_cypress
3131
end
3232

3333
def add_initial_files
34-
template "config/initializers/cypress_dev.rb.erb", "config/initializers/cypress_dev.rb"
34+
template "config/initializers/cypress_on_rails.rb.erb", "config/initializers/cypress_on_rails.rb"
3535
copy_file "spec/cypress/cypress_helper.rb", "#{options.cypress_folder}/cypress_helper.rb"
3636
copy_file "spec/cypress/support/on-rails.js", "#{options.cypress_folder}/support/on-rails.js"
3737
directory 'spec/cypress/app_commands', "#{options.cypress_folder}/app_commands"
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
if defined?(CypressDev)
2-
CypressDev.configure do |c|
1+
if defined?(CypressOnRails)
2+
CypressOnRails.configure do |c|
33
c.cypress_folder = File.expand_path("#{__dir__}/../../<%= options.cypress_folder %>")
4-
# WARNING!! CypressDev can execute arbitrary ruby code
4+
# WARNING!! CypressOnRails can execute arbitrary ruby code
55
# please use with extra caution if enabling on hosted servers or starting your local server on 0.0.0.0
66
c.use_middleware = Rails.env.test?
77
c.logger = Rails.logger
88
end
9-
end
9+
end

lib/generators/cypress_dev/templates/spec/cypress/app_commands/factory_bot.rb lib/generators/cypress_on_rails/templates/spec/cypress/app_commands/factory_bot.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
factory_method = factory_options.shift
33
begin
44
logger.debug "running #{factory_method}, #{factory_options}"
5-
CypressDev::SmartFactoryWrapper.public_send(factory_method, *factory_options)
5+
CypressOnRails::SmartFactoryWrapper.public_send(factory_method, *factory_options)
66
rescue => e
77
logger.error "#{e.class}: #{e.message}"
88
logger.error e.backtrace.join("\n")

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
end
1818
end
1919

20-
require 'cypress_dev/smart_factory_wrapper'
20+
require 'cypress_on_rails/smart_factory_wrapper'
2121

22-
factory = CypressDev::SimpleRailsFactory
22+
factory = CypressOnRails::SimpleRailsFactory
2323
factory = FactoryBot if defined?(FactoryBot)
2424
factory = FactoryGirl if defined?(FactoryGirl)
2525

26-
CypressDev::SmartFactoryWrapper.configure(
26+
CypressOnRails::SmartFactoryWrapper.configure(
2727
always_reload: !Rails.configuration.cache_classes,
2828
factory: factory,
2929
files: %w(spec/factories.rb ./spec/factories/**/*.rb)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// CypressDev: dont remove these command
1+
// CypressOnRails: dont remove these command
22
Cypress.Commands.add('appCommands', function (body) {
33
cy.log("APP: " + JSON.stringify(body))
44
cy.request({
@@ -29,7 +29,7 @@ Cypress.Commands.add('appFactories', function (options) {
2929
Cypress.Commands.add('appFixtures', function (options) {
3030
cy.app('activerecord_fixtures', options)
3131
});
32-
// CypressDev: end
32+
// CypressOnRails: end
3333

3434
// The next is optional
3535
// beforeEach(() => {

spec/cypress_dev/configuration_spec.rb

-23
This file was deleted.

spec/cypress_dev/command_executor_spec.rb spec/cypress_on_rails/command_executor_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require 'cypress_dev/command_executor'
1+
require 'cypress_on_rails/command_executor'
22

3-
RSpec.describe CypressDev::CommandExecutor do
3+
RSpec.describe CypressOnRails::CommandExecutor do
44
describe '.load' do
55
let(:folder) { "#{__dir__}/command_executor" }
66
subject { described_class }
@@ -10,7 +10,7 @@ def executor_load(*values)
1010
end
1111

1212
before do
13-
CypressDev.configuration.cypress_folder = folder
13+
CypressOnRails.configuration.cypress_folder = folder
1414
DummyTest.values.clear if defined?(DummyTest)
1515
end
1616

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
require 'cypress_on_rails/configuration'
2+
3+
RSpec.describe CypressOnRails::Configuration do
4+
it 'has defaults' do
5+
CypressOnRails.configure { |config| config.reset }
6+
7+
expect(CypressOnRails.configuration.cypress_folder).to eq('spec/cypress')
8+
expect(CypressOnRails.configuration.use_middleware?).to eq(true)
9+
expect(CypressOnRails.configuration.logger).to_not be_nil
10+
end
11+
12+
it 'can be configured' do
13+
my_logger = Logger.new(STDOUT)
14+
CypressOnRails.configure do |config|
15+
config.cypress_folder = 'my/path'
16+
config.use_middleware = false
17+
config.logger = my_logger
18+
end
19+
expect(CypressOnRails.configuration.cypress_folder).to eq('my/path')
20+
expect(CypressOnRails.configuration.use_middleware?).to eq(false)
21+
expect(CypressOnRails.configuration.logger).to eq(my_logger)
22+
end
23+
end

spec/cypress_dev/middleware_spec.rb spec/cypress_on_rails/middleware_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
require 'cypress_dev/middleware'
1+
require 'cypress_on_rails/middleware'
22

3-
RSpec.describe CypressDev::Middleware do
3+
RSpec.describe CypressOnRails::Middleware do
44
let(:app) { ->(env) { [200, {}, ["app did #{env['PATH_INFO']}"]] } }
5-
let(:command_executor) { class_double(CypressDev::CommandExecutor) }
5+
let(:command_executor) { class_double(CypressOnRails::CommandExecutor) }
66
let(:file) { class_double(File) }
77
subject { described_class.new(app, command_executor, file) }
88

spec/cypress_dev/railtie_spec.rb spec/cypress_on_rails/railtie_spec.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
require 'cypress_dev/railtie'
1+
require 'cypress_on_rails/railtie'
22

33
module Rails
44
def self.env
55
end
66
end
77

8-
RSpec.describe CypressDev::Railtie do
8+
RSpec.describe CypressOnRails::Railtie do
99
let(:rails_env) { double }
1010
let(:middleware) { double('Middleware', use: true) }
1111
let(:rails_app) { double('RailsApp', middleware: middleware) }
@@ -15,7 +15,7 @@ def self.env
1515
end
1616

1717
it 'runs the middleware in test mode' do
18-
CypressDev::Railtie.initializers.each do |initializer|
18+
CypressOnRails::Railtie.initializers.each do |initializer|
1919
initializer.run(rails_app)
2020
end
2121
end

0 commit comments

Comments
 (0)