Fix tests

Shopify · Jan 17, 2021 · 8f95799 · 8f95799
1 parent 10c8941
commit 8f95799
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/test/generators/install_generator_test.rb b/test/generators/install_generator_test.rb
@@ -23,10 +23,8 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     run_generator
     assert_file "config/initializers/shopify_app.rb" do |shopify_app|
       assert_match 'config.application_name = "My Shopify App"', shopify_app
-      assert_match "config.api_key = ENV.fetch('SHOPIFY_API_KEY', '').presence " \
-        "|| raise('Missing SHOPIFY_API_KEY')", shopify_app
-      assert_match "config.secret = ENV.fetch('SHOPIFY_API_SECRET', '').presence " \
-        "|| raise('Missing SHOPIFY_API_SECRET')", shopify_app
+      assert_match "config.api_key = ENV.fetch('SHOPIFY_API_KEY', '')", shopify_app
+      assert_match "config.secret = ENV.fetch('SHOPIFY_API_SECRET', '')", shopify_app
       assert_match 'config.scope = "read_products"', shopify_app
       assert_match "config.embedded_app = true", shopify_app
       assert_match 'config.api_version = "2019-10"', shopify_app
@@ -41,10 +39,8 @@ class InstallGeneratorTest < Rails::Generators::TestCase
                      --api_version unstable --scope read_orders write_products)
     assert_file "config/initializers/shopify_app.rb" do |shopify_app|
       assert_match 'config.application_name = "Test Name"', shopify_app
-      assert_match "config.api_key = ENV.fetch('SHOPIFY_API_KEY', '').presence " \
-        "|| raise('Missing SHOPIFY_API_KEY')", shopify_app
-      assert_match "config.secret = ENV.fetch('SHOPIFY_API_SECRET', '').presence " \
-        "|| raise('Missing SHOPIFY_API_SECRET')", shopify_app
+      assert_match "config.api_key = ENV.fetch('SHOPIFY_API_KEY', '')", shopify_app
+      assert_match "config.secret = ENV.fetch('SHOPIFY_API_SECRET', '')", shopify_app
       assert_match 'config.scope = "read_orders write_products"', shopify_app
       assert_match 'config.embedded_app = true', shopify_app
       assert_match 'config.api_version = "unstable"', shopify_app
@@ -56,10 +52,8 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     run_generator %w(--application_name Test Name --scope read_orders write_products)
     assert_file "config/initializers/shopify_app.rb" do |shopify_app|
       assert_match 'config.application_name = "Test Name"', shopify_app
-      assert_match "config.api_key = ENV.fetch('SHOPIFY_API_KEY', '').presence " \
-        "|| raise('Missing SHOPIFY_API_KEY')", shopify_app
-      assert_match "config.secret = ENV.fetch('SHOPIFY_API_SECRET', '').presence " \
-        "|| raise('Missing SHOPIFY_API_SECRET')", shopify_app
+      assert_match "config.api_key = ENV.fetch('SHOPIFY_API_KEY', '')", shopify_app
+      assert_match "config.secret = ENV.fetch('SHOPIFY_API_SECRET', '')", shopify_app
       assert_match 'config.scope = "read_orders write_products"', shopify_app
       assert_match 'config.embedded_app = true', shopify_app
       assert_match "config.shop_session_repository = 'Shop'", shopify_app