From 9fa4168535ac872ac8f99cb920fb588db6f85802 Mon Sep 17 00:00:00 2001 From: Molly Yu Date: Mon, 14 Mar 2022 16:43:12 -0400 Subject: [PATCH 1/2] Force push to overwrite csp file --- lib/shopify_cli/services/app/create/rails_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shopify_cli/services/app/create/rails_service.rb b/lib/shopify_cli/services/app/create/rails_service.rb index 8660e508a2..e8a13cdc77 100644 --- a/lib/shopify_cli/services/app/create/rails_service.rb +++ b/lib/shopify_cli/services/app/create/rails_service.rb @@ -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 From 39ccc5565bb8c273beb1d88d4c7039e70f65d2cc Mon Sep 17 00:00:00 2001 From: Molly Yu Date: Tue, 15 Mar 2022 12:30:01 -0400 Subject: [PATCH 2/2] Fix tests --- .../shopify-cli/services/app/create/rails_service_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/shopify-cli/services/app/create/rails_service_test.rb b/test/shopify-cli/services/app/create/rails_service_test.rb index d96adb87be..271f9d4323 100644 --- a/test/shopify-cli/services/app/create/rails_service_test.rb +++ b/test/shopify-cli/services/app/create/rails_service_test.rb @@ -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")) @@ -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")) @@ -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")) @@ -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"))