-
Notifications
You must be signed in to change notification settings - Fork 439
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
Namespacing directory generation fix #380
Open
nullset2
wants to merge
7
commits into
rails:main
Choose a base branch
from
nullset2:namespacing-directory-generation-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
100bca4
change gemfile to rails 5 release gemfile
532ca8a
adds failing tests
1e1778c
directories in index and show templates are now correctly generated see
9736ceb
Merge branch 'master' into namespacing-directory-generation-fix
nullset2 ec82689
whitespace fixes
fec10af
Merge branch 'namespacing-directory-generation-fix' of https://github…
e957a51
Merge branch 'master' into namespacing-directory-generation-fix
nullset2 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
json.array! @<%= plural_table_name %>, partial: '<%= plural_table_name %>/<%= singular_table_name %>', as: :<%= singular_table_name %> | ||
json.array! @<%= plural_table_name %>, partial: '<%= plural_table_name.gsub('_', '/') %>/<%= singular_table_name %>', as: :<%= singular_table_name %> |
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 +1 @@ | ||
json.partial! "<%= plural_table_name %>/<%= singular_table_name %>", <%= singular_table_name %>: @<%= singular_table_name %> | ||
json.partial! "<%= plural_table_name.gsub('_', '/') %>/<%= singular_table_name %>", <%= singular_table_name %>: @<%= singular_table_name %> |
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,38 @@ | ||
require 'test_helper' | ||
require 'rails/generators/test_case' | ||
require 'generators/rails/jbuilder_generator' | ||
|
||
class JbuilderGeneratorWithNamespaceTest < Rails::Generators::TestCase | ||
tests Rails::Generators::JbuilderGenerator | ||
arguments %w(api/foo bar:integer baz:string) | ||
destination File.expand_path('../tmp', __FILE__) | ||
setup :prepare_destination | ||
|
||
test 'all views are generated' do | ||
run_generator | ||
|
||
%w(index show).each do |view| | ||
assert_file "app/views/api/foos/#{view}.json.jbuilder" | ||
end | ||
assert_file "app/views/api/foos/_api_foo.json.jbuilder" | ||
end | ||
|
||
test 'the files are correctly structured to work' do | ||
run_generator | ||
|
||
assert_file 'app/views/api/foos/index.json.jbuilder' do |content| | ||
assert_match %r{json.array! @api_foos, partial: 'api/foos/api_foo', as: :api_foo}, content | ||
end | ||
|
||
assert_file 'app/views/api/foos/show.json.jbuilder' do |content| | ||
assert_match %r{json.partial! \"api/foos/api_foo\", api_foo: @api_foo}, content | ||
end | ||
|
||
assert_file 'app/views/api/foos/_api_foo.json.jbuilder' do |content| | ||
assert_match %r{json\.extract! api_foo, :id, :bar, :baz, :created_at, :updated_at}, content | ||
assert_match %r{json\.url api_foo_url\(api_foo, format: :json\)}, content | ||
end | ||
|
||
|
||
end | ||
end |
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.
Could you remove those blank lines?
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.
Do you mean the lines after 34 on the test?