Skip to content

Fixing install generator to have inserted content properly on the new Line #476

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 18, 2016
Merged

Fixing install generator to have inserted content properly on the new Line #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a92d002
Fixing install generator to have inserted content properly on the new…
akshaymohite Feb 12, 2016
cdf292f
Fixing install generator tests for new lines
akshaymohite Feb 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/generators/react/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def inject_react
if manifest.exist?
manifest_contents = File.read(manifest)

if match = manifest_contents.match(/\/\/=\s+require\s+turbolinks/)
if match = manifest_contents.match(/\/\/=\s+require\s+turbolinks\s+\n/)
inject_into_file manifest, require_react, { after: match[0] }
elsif match = manifest_contents.match(/\/\/=\s+require_tree[^\n]*/)
inject_into_file manifest, require_react, { before: match[0] }
Expand Down
18 changes: 11 additions & 7 deletions test/generators/install_generator_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def copy_directory(dir)
test "adds requires to `application.js`" do
run_generator

assert_application_file_modified
assert_application_file_created
end

test "it modifes an existing 'application.js'" do
Expand All @@ -30,15 +30,14 @@ def copy_directory(dir)
File.delete destination_root + '/app/assets/javascripts/application.js'

run_generator

assert_application_file_modified
assert_application_file_created
end

test "modifies `application.js` if it's empty" do
init_application_js ''

run_generator
assert_application_file_modified
assert_application_file_created
end

test "updates `application.js` if require_tree is commented" do
Expand Down Expand Up @@ -68,9 +67,14 @@ def init_application_js(content)
File.write destination_root + '/app/assets/javascripts/application.js', content
end

def assert_application_file_created
assert_file 'app/assets/javascripts/application.js',
%r{//= require react\n//= require react_ujs\n//= require components\n}
end

def assert_application_file_modified
assert_file 'app/assets/javascripts/application.js', %r{//= require react}
assert_file 'app/assets/javascripts/application.js', %r{//= require react_ujs}
assert_file 'app/assets/javascripts/application.js', %r{//= require components}
assert_file 'app/assets/javascripts/application.js', %r{\n//= require react\n}
assert_file 'app/assets/javascripts/application.js', %r{\n//= require react_ujs\n}
assert_file 'app/assets/javascripts/application.js', %r{\n//= require components\n}
end
end