-
-
Notifications
You must be signed in to change notification settings - Fork 61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rename CypressDev to CypressOnRails #19
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,16 @@ | ||
# -*- encoding: utf-8 -*- | ||
$LOAD_PATH.push File.expand_path("../lib", __FILE__) | ||
require "cypress_dev/version" | ||
require "cypress_on_rails/version" | ||
|
||
Gem::Specification.new do |s| | ||
s.name = "cypress-on-rails" | ||
s.version = CypressDev::VERSION | ||
s.version = CypressOnRails::VERSION | ||
s.author = ["miceportal team", 'Grant Petersen-Speelman'] | ||
s.email = ["[email protected]", '[email protected]'] | ||
s.homepage = "http://github.com/grantspeelman/cypress-on-rails" | ||
s.summary = "Integrates cypress with rails or rack applications" | ||
s.description = "Integrates cypress with rails or rack applications" | ||
s.post_install_message = 'The CypressDev constant is being deprecated and will be completely removed and replaced with CypressOnRails' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nice! |
||
s.rubyforge_project = s.name | ||
s.files = `git ls-files`.split("\n") | ||
s.test_files = `git ls-files -- {spec}/*`.split("\n") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,7 @@ | ||
require 'cypress_dev' | ||
require 'cypress_on_rails/version' | ||
require 'cypress_on_rails/configuration' | ||
require_relative './cypress_on_rails/railtie' if defined?(Rails) | ||
|
||
# maintain backward compatibility | ||
CypressDev = CypressOnRails | ||
Cypress = CypressDev |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
require 'cypress-on-rails' | ||
require 'cypress_dev/smart_factory_wrapper' | ||
require 'cypress_on_rails/smart_factory_wrapper' | ||
# for backward compatibility |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1 @@ | ||
require 'cypress_dev/version' | ||
require 'cypress_dev/configuration' | ||
require_relative './cypress_dev/railtie' if defined?(Rails) | ||
|
||
require 'cypress-on-rails' |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/cypress_dev/configuration.rb → lib/cypress_on_rails/configuration.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
lib/cypress_dev/simple_rails_factory.rb → lib/cypress_on_rails/simple_rails_factory.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
module CypressOnRails | ||
VERSION = '1.4.0' | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...es/config/initializers/cypress_dev.rb.erb → ...nfig/initializers/cypress_on_rails.rb.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
if defined?(CypressDev) | ||
CypressDev.configure do |c| | ||
if defined?(CypressOnRails) | ||
CypressOnRails.configure do |c| | ||
c.cypress_folder = File.expand_path("#{__dir__}/../../<%= options.cypress_folder %>") | ||
# WARNING!! CypressDev can execute arbitrary ruby code | ||
# WARNING!! CypressOnRails can execute arbitrary ruby code | ||
# please use with extra caution if enabling on hosted servers or starting your local server on 0.0.0.0 | ||
c.use_middleware = Rails.env.test? | ||
c.logger = Rails.logger | ||
end | ||
end | ||
end |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
require 'cypress_on_rails/configuration' | ||
|
||
RSpec.describe CypressOnRails::Configuration do | ||
it 'has defaults' do | ||
CypressOnRails.configure { |config| config.reset } | ||
|
||
expect(CypressOnRails.configuration.cypress_folder).to eq('spec/cypress') | ||
expect(CypressOnRails.configuration.use_middleware?).to eq(true) | ||
expect(CypressOnRails.configuration.logger).to_not be_nil | ||
end | ||
|
||
it 'can be configured' do | ||
my_logger = Logger.new(STDOUT) | ||
CypressOnRails.configure do |config| | ||
config.cypress_folder = 'my/path' | ||
config.use_middleware = false | ||
config.logger = my_logger | ||
end | ||
expect(CypressOnRails.configuration.cypress_folder).to eq('my/path') | ||
expect(CypressOnRails.configuration.use_middleware?).to eq(false) | ||
expect(CypressOnRails.configuration.logger).to eq(my_logger) | ||
end | ||
end |
6 changes: 3 additions & 3 deletions
6
spec/cypress_dev/middleware_spec.rb → spec/cypress_on_rails/middleware_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should the file itself be called
cypress-on-rails
?