Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Rails force generate to include overwritten CSP file #2143

Closed
wants to merge 2 commits into from
Closed

Rails force generate to include overwritten CSP file #2143

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
9fa4168
Force push to overwrite csp file
Mar 14, 2022
39ccc55
Fix tests
Mar 15, 2022
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/shopify_cli/services/app/create/rails_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def build(name, db)
end

CLI::UI::Frame.open(context.message("core.app.create.rails.running_generator")) do
syscall(%w(rails generate shopify_app --new-shopify-cli-app))
syscall(%w(rails generate shopify_app --new-shopify-cli-app -f))
end

CLI::UI::Frame.open(context.message("core.app.create.rails.running_migrations")) do
Expand Down
8 changes: 4 additions & 4 deletions test/shopify-cli/services/app/create/rails_service_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_can_create_new_app_with_rails_7
expect_command(%W(#{gem_path}/bin/rails new test-app --skip-spring --database=sqlite3))
expect_command(%W(#{gem_path}/bin/bundle install),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app),
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app -f),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails db:create),
chdir: File.join(@context.root, "test-app"))
Expand Down Expand Up @@ -108,7 +108,7 @@ def test_can_create_new_app
expect_command(%W(#{gem_path}/bin/rails new test-app --skip-spring --database=sqlite3))
expect_command(%W(#{gem_path}/bin/bundle install),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app),
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app -f),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails db:create),
chdir: File.join(@context.root, "test-app"))
Expand Down Expand Up @@ -161,7 +161,7 @@ def test_can_create_new_app_with_db_flag
expect_command(%W(#{gem_path}/bin/rails new test-app --skip-spring --database=postgresql))
expect_command(%W(#{gem_path}/bin/bundle install),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app),
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app -f),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails db:create),
chdir: File.join(@context.root, "test-app"))
Expand Down Expand Up @@ -210,7 +210,7 @@ def test_can_create_new_app_with_rails_opts_flag
expect_command(%W(#{gem_path}/bin/rails new test-app --skip-spring --database=sqlite3 --edge -J))
expect_command(%W(#{gem_path}/bin/bundle install),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app),
expect_command(%W(#{gem_path}/bin/rails generate shopify_app --new-shopify-cli-app -f),
chdir: File.join(@context.root, "test-app"))
expect_command(%W(#{gem_path}/bin/rails db:create),
chdir: File.join(@context.root, "test-app"))
Expand Down