disco_app 0.15.2 → 0.18.1

data/test/services/disco_app/flow/process_action_test.rb

@@ -0,0 +1,68 @@
+require 'test_helper'
+require 'interactor'
+
+class TestActionId
+
+  include Interactor
+
+  def call
+    # noop
+  end
+
+end
+
+module DiscoApp
+  module Flow
+    class ProcessActionTest < ActiveSupport::TestCase
+
+      include ActiveJob::TestHelper
+
+      def setup
+        @shop = disco_app_shops(:widget_store)
+        @action = @shop.flow_actions.create(
+          action_id: 'test_action_id',
+          action_run_id: 'bdb15e45-4f9d-4c80-88c8-7b43a24edaac-30892-cc8eb62a-14db-43fc-bc33-d6dea41ae623',
+          properties: { 'customer_email' => 'name@example.com' }
+        )
+        @now = Time.zone.parse('2018-12-29T00:00:00Z')
+        Timecop.freeze(@now)
+      end
+
+      def teardown
+        @shop = nil
+        @action = nil
+        @now = nil
+        Timecop.return
+      end
+
+      test 'call to process action that has already succeeded fails' do
+        @action.succeeded!
+        result = ProcessAction.call(action: @action)
+        assert_not result.success?
+      end
+
+      test 'call to process trigger that has already failed fails' do
+        @action.failed!
+        result = ProcessAction.call(action: @action)
+        assert_not result.success?
+      end
+
+      test 'processing pending action with existing service class succeeds' do
+        result = ProcessAction.call(action: @action)
+        assert result.success?
+        assert @action.succeeded?
+        assert_equal @now, @action.processed_at
+      end
+
+      test 'processing pending action with non-existent service class does not succeed' do
+        @action.update!(action_id: 'unknown_test_action_id')
+        result = ProcessAction.call(action: @action)
+        assert_not result.success?
+        assert @action.failed?
+        assert_equal @now, @action.processed_at
+        assert_equal ['Could not find service class for unknown_test_action_id'], @action.processing_errors
+      end
+
+    end
+  end
+end

data/test/services/disco_app/flow/process_trigger_test.rb

@@ -0,0 +1,94 @@
+require 'test_helper'
+
+module DiscoApp
+  module Flow
+    class ProcessTriggerTest < ActiveSupport::TestCase
+
+      include ActiveJob::TestHelper
+
+      def setup
+        @shop = disco_app_shops(:widget_store)
+        @trigger = @shop.flow_triggers.create(
+          title: 'Test trigger',
+          resource_name: 'test_resource_name',
+          resource_url: 'https://example.com/test-resource-url',
+          properties: { 'Customer email' => 'name@example.com' }
+        )
+        @now = Time.zone.parse('2018-12-29T00:00:00Z')
+        Timecop.freeze(@now)
+      end
+
+      def teardown
+        @shop = nil
+        @trigger = nil
+        @now = nil
+        Timecop.return
+      end
+
+      test 'call to process trigger that has already succeeded fails' do
+        @trigger.succeeded!
+        result = ProcessTrigger.call(trigger: @trigger)
+        assert_not result.success?
+      end
+
+      test 'call to process trigger that has already failed fails' do
+        @trigger.failed!
+        result = ProcessTrigger.call(trigger: @trigger)
+        assert_not result.success?
+      end
+
+      test 'call to process trigger that has already been skipped fails' do
+        @trigger.skipped!
+        result = ProcessTrigger.call(trigger: @trigger)
+        assert_not result.success?
+      end
+
+      test 'call to process trigger that we know is not being used succeeds with skipped status logged' do
+        @shop.flow_trigger_usages.create(
+          flow_trigger_definition_id: @trigger.title,
+          has_enabled_flow: false,
+          timestamp: @now
+        )
+        result = ProcessTrigger.call(trigger: @trigger)
+        assert result.success?
+        assert @trigger.skipped?
+        assert_equal @now, @trigger.processed_at
+      end
+
+      test 'processing valid pending trigger succeeds and makes the expected api call' do
+        VCR.use_cassette('flow_trigger_valid') do
+          result = ProcessTrigger.call(trigger: @trigger)
+          assert result.success?
+          assert @trigger.succeeded?
+          assert_equal @now, @trigger.processed_at
+        end
+      end
+
+      test 'processing valid pending trigger that we know is being used succeeds and makes the expected api call' do
+        @shop.flow_trigger_usages.create(
+          flow_trigger_definition_id: @trigger.title,
+          has_enabled_flow: true,
+          timestamp: @now
+        )
+
+        VCR.use_cassette('flow_trigger_valid') do
+          result = ProcessTrigger.call(trigger: @trigger)
+          assert result.success?
+          assert @trigger.succeeded?
+          assert_equal @now, @trigger.processed_at
+        end
+      end
+
+      test 'processing invalid pending trigger makes the expected api call with errors logged' do
+        VCR.use_cassette('flow_trigger_invalid_title') do
+          result = ProcessTrigger.call(trigger: @trigger)
+          assert_not result.success?
+          assert @trigger.failed?
+          assert_equal @now, @trigger.processed_at
+          assert_equal 1, @trigger.processing_errors.size
+        end
+      end
+
+    end
+  end
+end

data/test/services/disco_app/flow/update_trigger_usage_test.rb

@@ -0,0 +1,87 @@
+require 'test_helper'
+
+module DiscoApp
+  module Flow
+    class UpdateTriggerUsageTest < ActiveSupport::TestCase
+
+      include ActiveJob::TestHelper
+
+      def setup
+        @shop = disco_app_shops(:widget_store)
+      end
+
+      def teardown
+        @shop = nil
+      end
+
+      test 'when no usage record exists and usage is true, record is persisted as expected' do
+        result = UpdateTriggerUsage.call(
+          shop: @shop,
+          flow_trigger_definition_id: flow_trigger_definition_id,
+          has_enabled_flow: true,
+          timestamp: timestamp
+        )
+
+        assert result.success?
+        assert result.trigger_usage.persisted?
+        assert result.trigger_usage.has_enabled_flow?
+        assert_equal timestamp, result.trigger_usage.timestamp
+      end
+
+      test 'when usage record exists and timestamp is older, record is updated as expected' do
+        older_timestamp = timestamp - 7.days
+
+        trigger_usage = @shop.flow_trigger_usages.create!(
+          flow_trigger_definition_id: flow_trigger_definition_id,
+          has_enabled_flow: true,
+          timestamp: older_timestamp
+        )
+
+        result = UpdateTriggerUsage.call(
+          shop: @shop,
+          flow_trigger_definition_id: flow_trigger_definition_id,
+          has_enabled_flow: false,
+          timestamp: timestamp
+        )
+
+        assert result.success?
+        assert_equal trigger_usage, result.trigger_usage
+        assert_not result.trigger_usage.has_enabled_flow?
+        assert_equal timestamp, result.trigger_usage.timestamp
+      end
+
+      test 'when usage record exists and timestamp is newer, record is not updated' do
+        newer_timestamp = timestamp + 7.days
+
+        trigger_usage = @shop.flow_trigger_usages.create!(
+          flow_trigger_definition_id: flow_trigger_definition_id,
+          has_enabled_flow: true,
+          timestamp: newer_timestamp
+        )
+
+        result = UpdateTriggerUsage.call(
+          shop: @shop,
+          flow_trigger_definition_id: flow_trigger_definition_id,
+          has_enabled_flow: false,
+          timestamp: timestamp
+        )
+
+        assert result.success?
+        assert_equal trigger_usage, result.trigger_usage
+        assert result.trigger_usage.has_enabled_flow?
+        assert_equal newer_timestamp, result.trigger_usage.timestamp
+      end
+
+      private
+
+        def flow_trigger_definition_id
+          'Test trigger'
+        end
+
+        def timestamp
+          @timestamp ||= Time.parse('2020-04-05T00:34:00Z')
+        end
+
+    end
+  end
+end

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'
@@ -11,11 +11,12 @@ ENV['SHOPIFY_APP_REDIRECT_URI'] = 'https://test.example.com/shopify/auth/callbac
 ENV['SHOPIFY_APP_SCOPE'] = 'read_products'
 ENV['SHOPIFY_CHARGES_REAL'] = 'false'
 ENV['DISCO_API_URL'] = 'https://api.discolabs.com/v1/'
+ENV['SHOPIFY_APP_API_VERSION'] = '2019-10'
 
-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 +34,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 +49,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
@@ -61,11 +62,13 @@ class ActiveSupport::TestCase
   def log_in_as(shop)
     session[:shopify] = shop.id
     session[:shopify_domain] = shop.shopify_domain
+    session[:api_version] = shop.api_version
   end
 
   def log_out
     session[:shopify] = nil
     session[:shopify_domain] = nil
+    session[:api_version] = nil
   end
 
 end

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

data/test/vcr/webhook_failure.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://widgets.myshopify.com/admin/webhooks.json
+    uri: https://widgets.myshopify.com/admin/api/2019-10/webhooks.json
     body:
       encoding: US-ASCII
       string: ''
@@ -95,10 +95,10 @@ http_interactions:
   recorded_at: Sun, 07 Jan 2018 22:02:25 GMT
 - request:
     method: post
-    uri: https://widgets.myshopify.com/admin/webhooks.json
+    uri: https://widgets.myshopify.com/admin/api/2019-10/webhooks.json
     body:
       encoding: UTF-8
-      string: '{"webhook":{"topic":"app/uninstalled","address":"https://test.example.com/webhooks","format":"json"}}'
+      string: '{"webhook":{"topic":"app/uninstalled","fields":[],"address":"https://test.example.com/webhooks","format":"json"}}'
     headers:
       Content-Type:
       - application/json
@@ -185,10 +185,10 @@ http_interactions:
   recorded_at: Sun, 07 Jan 2018 22:02:26 GMT
 - request:
     method: post
-    uri: https://widgets.myshopify.com/admin/webhooks.json
+    uri: https://widgets.myshopify.com/admin/api/2019-10/webhooks.json
     body:
       encoding: UTF-8
-      string: '{"webhook":{"topic":"shop/update","address":"https://test.example.com/webhooks","format":"json"}}'
+      string: '{"webhook":{"topic":"shop/update","fields":[],"address":"https://test.example.com/webhooks","format":"json"}}'
     headers:
       Content-Type:
       - application/json
@@ -275,10 +275,10 @@ http_interactions:
   recorded_at: Sun, 07 Jan 2018 22:02:28 GMT
 - request:
     method: post
-    uri: https://widgets.myshopify.com/admin/webhooks.json
+    uri: https://widgets.myshopify.com/admin/api/2019-10/webhooks.json
     body:
       encoding: UTF-8
-      string: '{"webhook":{"topic":"orders/create","address":"https://test.example.com/webhooks","format":"json"}}'
+      string: '{"webhook":{"topic":"orders/create","fields":[],"address":"https://test.example.com/webhooks","format":"json"}}'
     headers:
       Content-Type:
       - application/json
@@ -366,10 +366,10 @@ http_interactions:
   recorded_at: Sun, 07 Jan 2018 22:02:29 GMT
 - request:
     method: post
-    uri: https://widgets.myshopify.com/admin/webhooks.json
+    uri: https://widgets.myshopify.com/admin/api/2019-10/webhooks.json
     body:
       encoding: UTF-8
-      string: '{"webhook":{"topic":"orders/paid","address":"https://test.example.com/webhooks","format":"json"}}'
+      string: '{"webhook":{"topic":"orders/paid","fields":["id"],"address":"https://test.example.com/webhooks","format":"json"}}'
     headers:
       Content-Type:
       - application/json
@@ -457,10 +457,10 @@ http_interactions:
   recorded_at: Sun, 07 Jan 2018 22:02:30 GMT
 - request:
     method: post
-    uri: https://widgets.myshopify.com/admin/webhooks.json
+    uri: https://widgets.myshopify.com/admin/api/2019-10/webhooks.json
     body:
       encoding: UTF-8
-      string: '{"webhook":{"topic":"carts/create","address":"https://test.example.com/webhooks","format":"json"}}'
+      string: '{"webhook":{"topic":"carts/create","fields":[],"address":"https://test.example.com/webhooks","format":"json"}}'
     headers:
       Content-Type:
       - application/json
@@ -548,10 +548,10 @@ http_interactions:
   recorded_at: Sun, 07 Jan 2018 22:02:31 GMT
 - request:
     method: post
-    uri: https://widgets.myshopify.com/admin/webhooks.json
+    uri: https://widgets.myshopify.com/admin/api/2019-10/webhooks.json
     body:
       encoding: UTF-8
-      string: '{"webhook":{"topic":"carts/update","address":"https://test.example.com/webhooks","format":"json"}}'
+      string: '{"webhook":{"topic":"carts/update","fields":[],"address":"https://test.example.com/webhooks","format":"json"}}'
     headers:
       Content-Type:
       - application/json