TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Change Gemfile’s double quotes in plugin generator

Browse Source 
Since the generated application’s Gemfile is using single quotation marks, it
seems fair to use it on plugin’s Gemfile as well.
This commit is contained in:
Josemar Luedke 2014-05-10 17:56:16 -03:00
parent e1cb956c9d
commit 08b435e1bd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
railties/lib/rails/generators/rails/plugin/templates/Gemfile
View File

@ -1,7 +1,7 @@
source "https://rubygems.org"
source 'https://rubygems.org'
<% if options[:skip_gemspec] -%>
<%= '# ' if options.dev? || options.edge? -%>gem "rails", "~> <%= Rails::VERSION::STRING %>"
<%= '# ' if options.dev? || options.edge? -%>gem 'rails', '~> <%= Rails::VERSION::STRING %>'
<% else -%>
# Declare your gem's dependencies in <%= name %>.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and
@ -11,7 +11,7 @@ gemspec
<% if options[:skip_gemspec] -%>
group :development do
gem "<%= gem_for_database %>"
gem '<%= gem_for_database %>'
end
<% else -%>
# Declare any dependencies that are still in development here instead of in

8
railties/test/generators/plugin_generator_test.rb
View File

@ -312,7 +312,7 @@ def test_skipping_gemspec
assert_no_file "bukkits.gemspec"
assert_file "Gemfile" do |contents|
assert_no_match('gemspec', contents)
assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
assert_match(/gem 'rails', '~> #{Rails.version}'/, contents)
assert_match_sqlite3(contents)
assert_no_match(/# gem "jquery-rails"/, contents)
end
@ -323,7 +323,7 @@ def test_skipping_gemspec_in_full_mode
assert_no_file "bukkits.gemspec"
assert_file "Gemfile" do |contents|
assert_no_match('gemspec', contents)
assert_match(/gem "rails", "~> #{Rails.version}"/, contents)
assert_match(/gem 'rails', '~> #{Rails.version}'/, contents)
assert_match_sqlite3(contents)
end
end
@ -416,9 +416,9 @@ def default_files
def assert_match_sqlite3(contents)
unless defined?(JRUBY_VERSION)
assert_match(/group :development do\n gem "sqlite3"\nend/, contents)
assert_match(/group :development do\n gem 'sqlite3'\nend/, contents)
else
assert_match(/group :development do\n gem "activerecord-jdbcsqlite3-adapter"\nend/, contents)
assert_match(/group :development do\n gem 'activerecord-jdbcsqlite3-adapter'\nend/, contents)
end
end
end