disco_app 0.14.4 → 0.17.0

data/test/services/disco_app/subscription_service_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class DiscoApp::SubscriptionServiceTest < ActiveSupport::TestCase
+
   include ActiveJob::TestHelper
 
   def setup
@@ -44,14 +45,14 @@ class DiscoApp::SubscriptionServiceTest < ActiveSupport::TestCase
   test 'new subscription for a plan with a trial period created correctly' do
     new_subscription = DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:premium))
     assert new_subscription.trial?
-    assert_equal Time.now, new_subscription.trial_start_at
+    assert_equal Time.zone.now, new_subscription.trial_start_at
     assert_equal 28.days.from_now, new_subscription.trial_end_at
   end
 
   test 'new subscription for a plan with a plan code created correctly' do
     new_subscription = DiscoApp::SubscriptionService.subscribe(@shop, disco_app_plans(:premium), 'PODCAST')
     assert new_subscription.trial?
-    assert_equal Time.now, new_subscription.trial_start_at
+    assert_equal Time.zone.now, new_subscription.trial_start_at
     assert_equal 60.days.from_now, new_subscription.trial_end_at
     assert_equal 60, new_subscription.trial_period_days
     assert_equal 8999, new_subscription.amount

data/test/support/test_file_fixtures.rb

@@ -10,13 +10,13 @@ module DiscoApp::Test
     # Return a JSON fixture as an indifferent hash.
     def json_fixture(path)
       filename = File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'json', "#{path}.json")
-      HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(File.read(filename)))
+      HashWithIndifferentAccess.new(JSON.parse(File.read(filename)))
     end
 
     # API fixtures are special-case JSON fixtures.
     def api_fixture(path)
       filename = File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'api', "#{path}.json")
-      HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(File.read(filename)))
+      HashWithIndifferentAccess.new(JSON.parse(File.read(filename)))
     end
 
     # Webhook fixtures are special-case JSON fixtures.

data/test/support/test_shopify_api.rb

@@ -5,7 +5,7 @@ module DiscoApp::Test
       if method == :get
         stub_request(method, endpoint)
           .to_return(status: 200, body: api_fixture("#{fixture_name}_response").to_json)
-      elsif method == :post or method == :put
+      elsif (method == :post) || (method == :put)
         stub_request(method, endpoint)
           .with(body: api_fixture("#{fixture_name}_request").to_json)
           .to_return(status: 201, body: api_fixture("#{fixture_name}_response").to_json)

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 # Prevent warnings from showing up during testing.
-$VERBOSE=nil
+$VERBOSE = nil
 
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
@@ -12,10 +12,10 @@ ENV['SHOPIFY_APP_SCOPE'] = 'read_products'
 ENV['SHOPIFY_CHARGES_REAL'] = 'false'
 ENV['DISCO_API_URL'] = 'https://api.discolabs.com/v1/'
 
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
-require "rails/test_help"
+require File.expand_path('../test/dummy/config/environment.rb', __dir__)
+ActiveRecord::Migrator.migrations_paths = [File.expand_path('../test/dummy/db/migrate', __dir__)]
+ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __dir__)
+require 'rails/test_help'
 
 # Require our additional test support helpers.
 require 'support/test_file_fixtures'
@@ -33,7 +33,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+  ActiveSupport::TestCase.fixture_path = File.expand_path('fixtures', __dir__)
   ActiveSupport::TestCase.fixtures :all
 end
 
@@ -48,7 +48,7 @@ end
 # Minitest helpers to give a better formatted and more helpful output in Rubymine
 require 'minitest/reporters'
 require 'minitest/autorun'
-MiniTest::Reporters.use!
+MiniTest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
 # Set up the base test class.
 class ActiveSupport::TestCase

data/test/vcr/flow_trigger_invalid_title.yml

@@ -0,0 +1,35 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://widgets.myshopify.com/admin/api/graphql.json
+    body:
+      encoding: UTF-8
+      string: '{"query":"\n        mutation {\n          flowTriggerReceive(body: \"{\\\"trigger_title\\\":\\\"Test trigger\\\",\\\"resources\\\":[{\\\"name\\\":\\\"test_resource_name\\\",\\\"url\\\":\\\"https://example.com/test-resource-url\\\"}],\\\"properties\\\":{\\\"Customer email\\\":\\\"name@example.com\\\"}}\") {\n            userErrors {\n              field,\n              message\n            }\n          }\n        }\n      "}'
+    headers:
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Type:
+      - application/json
+      X-Shopify-Access-Token:
+      - 00000000000000000000000000000000
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Sat, 29 Dec 2018 11:44:11 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+    body:
+      encoding: ASCII-8BIT
+      string: '{"data":{"flowTriggerReceive":{"userErrors":[{"field":["body"],"message":"Errors
+        validating schema:\n  Invalid trigger_title ''Test trigger''.\n"}]}},"extensions":{"cost":{"requestedQueryCost":1,"actualQueryCost":1,"throttleStatus":{"maximumAvailable":2000.0,"currentlyAvailable":1999,"restoreRate":100.0}}}}'
+    http_version:
+  recorded_at: Sat, 29 Dec 2018 11:44:11 GMT
+recorded_with: VCR 3.0.3

data/test/vcr/flow_trigger_valid.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://widgets.myshopify.com/admin/api/graphql.json
+    body:
+      encoding: UTF-8
+      string: '{"query":"\n        mutation {\n          flowTriggerReceive(body: \"{\\\"trigger_title\\\":\\\"Test trigger\\\",\\\"resources\\\":[{\\\"name\\\":\\\"test_resource_name\\\",\\\"url\\\":\\\"https://example.com/test-resource-url\\\"}],\\\"properties\\\":{\\\"Customer email\\\":\\\"name@example.com\\\"}}\") {\n            userErrors {\n              field,\n              message\n            }\n          }\n        }\n      "}'
+    headers:
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Type:
+      - application/json
+      X-Shopify-Access-Token:
+      - 00000000000000000000000000000000
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Sat, 29 Dec 2018 11:46:27 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: '{"data":{"flowTriggerReceive":{"userErrors":[]}},"extensions":{"cost":{"requestedQueryCost":1,"actualQueryCost":1,"throttleStatus":{"maximumAvailable":2000.0,"currentlyAvailable":1999,"restoreRate":100.0}}}}'
+    http_version:
+  recorded_at: Sat, 29 Dec 2018 11:46:27 GMT
+recorded_with: VCR 3.0.3