disco_app 0.12.7.pre.puma.pre.3 → 0.18.4

data/test/fixtures/api/subscriptions/valid_request.json

@@ -9,7 +9,7 @@
     "domain": null,
     "plan_name": null,
     "name": null,
-    "data": {"timezone": "(GMT+10:00) Melbourne", "country_name": "Australia"}
+    "data": {"timezone": "(GMT+10:00) Melbourne", "country_name": "Australia", "iana_timezone":  "Australia/Melbourne"}
   },
   "subscription": {
     "id": 304261385,
@@ -24,8 +24,8 @@
     "cancelled_at": null,
     "amount": 999,
     "plan_code_id": null,
-    "source": null,
     "trial_period_days": 14,
+    "source_id": null,
     "active_charge": {
       "id":332186283,
       "shop_id":605094243,

data/test/fixtures/api/widget_store/charges/{activate_application_charge_request.json → get_active_application_charge_response.json}

@@ -4,7 +4,7 @@
     "name": "Lifetime",
     "api_client_id": 755357713,
     "price": "49.00",
-    "status": "accepted",
+    "status": "active",
     "return_url": "https://test.example.com/subscriptions/304261385/charges/629961174/activate",
     "created_at": "2015-09-02T14:52:56-04:00",
     "updated_at": "2015-09-02T14:52:56-04:00",

data/test/fixtures/api/widget_store/charges/{activate_recurring_application_charge_request.json → get_active_recurring_application_charge_response.json}

@@ -4,13 +4,13 @@
     "name": "Basic",
     "api_client_id": 755357713,
     "price": "9.99",
-    "status": "accepted",
+    "status": "active",
     "return_url": "https://test.example.com/subscriptions/304261385/charges/629961174/activate",
     "billing_on": null,
     "created_at": "2015-09-02T14:50:32-04:00",
     "updated_at": "2015-09-02T14:50:32-04:00",
     "test": true,
-    "activated_on": null,
+    "activated_on": "2015-09-02T14:50:32-04:00",
     "trial_ends_on": null,
     "cancelled_on": null,
     "trial_days": 14,

data/test/fixtures/api/widget_store/empty_webhooks.json

@@ -0,0 +1,3 @@
+{
+  "webhooks": []
+}

data/test/fixtures/api/widget_store/existing_webhooks.json

@@ -0,0 +1,43 @@
+{
+  "webhooks": [
+    {
+      "id": 748073353265,
+      "address": "https://test.example.com/webhooks",
+      "topic": "shop/update",
+      "created_at": "2020-04-01T00:00:00Z",
+      "updated_at": "2020-04-01T00:00:00Z",
+      "format": "json",
+      "fields": [],
+      "metafield_namespaces": [],
+      "api_version": "2020-04",
+      "private_metafield_namespaces": []
+    },
+    {
+      "id": 748073353266,
+      "address": "https://old.example.com/webhooks",
+      "topic": "orders/create",
+      "created_at": "2020-04-01T00:00:00Z",
+      "updated_at": "2020-04-01T00:00:00Z",
+      "format": "json",
+      "fields": [],
+      "metafield_namespaces": [],
+      "api_version": "2020-04",
+      "private_metafield_namespaces": []
+    },
+    {
+      "id": 748073353267,
+      "address": "https://test.example.com/webhooks",
+      "topic": "orders/paid",
+      "created_at": "2020-04-01T00:00:00Z",
+      "updated_at": "2020-04-01T00:00:00Z",
+      "format": "json",
+      "fields": [
+        "id",
+        "financial_status"
+      ],
+      "metafield_namespaces": [],
+      "api_version": "2020-04",
+      "private_metafield_namespaces": []
+    }
+  ]
+}

data/test/fixtures/api/widget_store/products/get_metafields_empty_response.json

@@ -0,0 +1,3 @@
+{
+  "metafields": []
+}

data/test/fixtures/api/widget_store/products/get_metafields_with_existing_response.json

@@ -0,0 +1,11 @@
+{
+  "metafields": [
+    {
+      "id": 874857827343,
+      "namespace": "namespace1",
+      "key": "key1",
+      "value": "value9",
+      "value_type": "string"
+    }
+  ]
+}

data/test/fixtures/api/widget_store/products/write_metafields_multiple_namespaces_request.json

@@ -3,24 +3,28 @@
     "id": 632910393,
     "metafields": [
       {
+        "id": null,
         "namespace": "namespace1",
         "key": "n1key1",
         "value": "value1",
         "value_type": "string"
       },
       {
+        "id": null,
         "namespace": "namespace1",
         "key": "n1key2",
         "value": 2,
         "value_type": "integer"
       },
       {
+        "id": null,
         "namespace": "namespace2",
         "key": "n2key3",
         "value": "value3",
         "value_type": "string"
       },
       {
+        "id": null,
         "namespace": "namespace2",
         "key": "n2key4",
         "value": 2,

data/test/fixtures/api/widget_store/products/write_metafields_single_namespace_request.json

@@ -3,12 +3,14 @@
     "id": 632910393,
     "metafields": [
       {
+        "id": null,
         "namespace": "namespace1",
         "key": "key1",
         "value": "value1",
         "value_type": "string"
       },
       {
+        "id": null,
         "namespace": "namespace1",
         "key": "key2",
         "value": 2,

data/test/fixtures/api/widget_store/products/write_metafields_with_existing_single_namespace_request.json

@@ -0,0 +1,21 @@
+{
+  "product": {
+    "id": 632910393,
+    "metafields": [
+      {
+        "id": 874857827343,
+        "namespace": "namespace1",
+        "key": "key1",
+        "value": "value1",
+        "value_type": "string"
+      },
+      {
+        "id": null,
+        "namespace": "namespace1",
+        "key": "key2",
+        "value": "{\"json_key\":\"json_value\"}",
+        "value_type": "json_string"
+      }
+    ]
+  }
+}

data/test/fixtures/api/widget_store/shops/get_metafields_with_existing_response.json

@@ -0,0 +1,11 @@
+{
+  "metafields": [
+    {
+      "id": 874857827343,
+      "namespace": "namespace1",
+      "key": "key1",
+      "value": "value9",
+      "value_type": "string"
+    }
+  ]
+}

data/test/fixtures/api/widget_store/shops/write_metafields_with_existing_first_request.json

@@ -0,0 +1,9 @@
+{
+  "metafield": {
+    "id": 874857827343,
+    "namespace": "namespace1",
+    "key": "key1",
+    "value": "value1",
+    "value_type": "string"
+  }
+}

data/test/fixtures/api/widget_store/shops/write_metafields_with_existing_second_request.json

@@ -0,0 +1,9 @@
+{
+  "metafield": {
+    "id": null,
+    "namespace": "namespace1",
+    "key": "key2",
+    "value": 2,
+    "value_type": "integer"
+  }
+}

data/test/fixtures/api/widget_store/shops/write_metafields_with_existing_second_response.json

@@ -0,0 +1 @@
+{}

data/test/fixtures/api/widget_store/users.json

@@ -0,0 +1,42 @@
+{
+  "users": [
+    {
+      "id": 799407056,
+      "first_name": "Steve",
+      "email": "steve@apple.com",
+      "url": "www.apple.com",
+      "im": null,
+      "screen_name": null,
+      "phone": null,
+      "last_name": "Jobs",
+      "account_owner": true,
+      "receive_announcements": 1,
+      "bio": null,
+      "permissions": [
+        "full"
+      ],
+      "user_type": "regular",
+      "phone_validated?": false,
+      "tfa_enabled?": false
+    },
+    {
+      "id": 930143300,
+      "first_name": "noaccesssteve",
+      "email": "noaccesssteve@jobs.com",
+      "url": "www.apple.com",
+      "im": null,
+      "screen_name": null,
+      "phone": null,
+      "last_name": "Jobs",
+      "account_owner": false,
+      "receive_announcements": 1,
+      "bio": null,
+      "permissions": [
+        "limited"
+      ],
+      "user_type": "regular",
+      "phone_validated?": false,
+      "tfa_enabled?": false
+    }
+  ]
+}

data/test/fixtures/disco_app/shops.yml

@@ -3,10 +3,17 @@ widget_store:
   shopify_token: 00000000000000000000000000000000
   created_at: "2017-03-07T06:06:25.000Z"
   updated_at: "2017-03-07T06:06:25.000Z"
-  data: '{ "country_name": "Australia", "timezone": "(GMT+10:00) Melbourne" }'
+  data:
+    country_name: 'Australia'
+    timezone: '(GMT+10:00) Melbourne'
+    iana_timezone: 'Australia/Melbourne'
 
 widget_store_dev:
   shopify_domain: widgets-dev.myshopify.com
   shopify_token: 00000000000000000000000000000000
   status: 3
-  data: '{ "country_name": "Sweden", "primary_locale": "sv" }'
+  data:
+    country_name: 'Sweden'
+    primary_locale: 'sv'
+  created_at: "2017-03-07T06:06:25.000Z"
+  updated_at: "2017-03-07T06:06:25.000Z"

data/test/fixtures/disco_app/sources.yml

@@ -0,0 +1,3 @@
+source_1:
+  source: 'smp'
+  name: 'smpodcast'

data/test/fixtures/liquid/model.liquid

@@ -1,8 +1,8 @@
-{% assign model_numeric = 42 %}
-{% assign model_boolean = true %}
-{% assign model_empty = nil %}
-{% assign model_string = 'The cat's pyjamas are "great".' %}
-{% assign model_string_html = 'The cat&#39;s pyjamas are <strong style="color: red;">great</strong>.' %}
-{% assign model_array_of_numerics = '1@!@2@!@3' | split: '@!@' %}
-{% assign model_array_of_strings = 'A@!@B@!@C' | split: '@!@' %}
-{% assign model_hash = '{}' %}
+{%- assign model_numeric = 42 -%}
+{%- assign model_boolean = true -%}
+{%- assign model_empty = nil -%}
+{%- assign model_string = 'The cat&#39;s pyjamas are &quot;great&quot;.' -%}
+{%- assign model_string_html = 'The cat&#39;s pyjamas are <strong style="color: red;">great</strong>.' -%}
+{%- assign model_array_of_numerics = '1@!@2@!@3' | split: '@!@' -%}
+{%- assign model_array_of_strings = 'A@!@B@!@C' | split: '@!@' -%}
+{%- assign model_hash = '{}' -%}

data/test/fixtures/webhooks/flow/trigger_usage.json

@@ -0,0 +1,7 @@
+{
+  "flow_trigger_definition_id": "Test trigger",
+  "has_enabled_flow": false,
+  "shop_id": "690933842",
+  "shopify_domain": "widgets.myshopify.com",
+  "timestamp": "2020-04-05T00:34:00.001Z"
+}

data/test/integration/synchronises_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class SynchronisesTest < ActionDispatch::IntegrationTest
+
+  include ActiveJob::TestHelper
   fixtures :all
 
   def setup
@@ -14,31 +16,40 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
   end
 
   test 'new product is created when product created webhook is received' do
-    post_webhook('product_created', :'products/create')
+    perform_enqueued_jobs do
+      post_webhook('product_created', :'products/create')
+    end
 
     # Assert the product was created locally, with the correct attributes.
     product = Product.find(632910392)
-    assert_equal 'IPod Nano - 8GB', product.data['title']
+    assert_equal 'IPod Nano - 8GB', product.data[:title]
   end
 
   test 'existing product is updated when product updated webhook is received' do
     assert_equal({}, @product.data)
 
-    post_webhook('product_updated', :'products/update')
+    perform_enqueued_jobs do
+      post_webhook('product_updated', :'products/update')
+    end
 
     # Assert the product was updated locally, with the correct attributes.
     @product.reload
     assert_equal 632910393, @product.id
-    assert_equal 'IPod Nano - 8GB', @product.data['title']
+    assert_equal 'IPod Nano - 8GB', @product.data[:title]
   end
 
   test 'existing product is deleted when product deleted webhook is received' do
-    post_webhook('product_deleted', :'products/delete')
+    perform_enqueued_jobs do
+      post_webhook('product_deleted', :'products/delete')
+    end
+
     assert_equal 0, Product.count
   end
 
   test 'cart with token for id is updated when cart updated webhook is received' do
-    post_webhook('cart_updated', :'carts/update')
+    perform_enqueued_jobs do
+      post_webhook('cart_updated', :'carts/update')
+    end
 
     # Assert the cart data was correctly updated
     assert_equal 3200.0, carts(:cart).total_price
@@ -47,13 +58,13 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
   test 'shopify api model still allows synchronisation' do
     assert_equal({}, @product.data)
 
-    shopify_product = ShopifyAPI::Product.new(ActiveSupport::JSON.decode(webhook_fixture('product_updated')))
+    shopify_product = ShopifyAPI::Product.new(JSON.parse(webhook_fixture('product_updated')))
     Product.synchronise(@shop, shopify_product)
 
     # Assert the product was updated locally, with the correct attributes.
     @product.reload
     assert_equal 632910393, @product.id
-    assert_equal 'IPod Nano - 8GB', @product.data['title']
+    assert_equal 'IPod Nano - 8GB', @product.data[:title]
   end
 
   private
@@ -64,11 +75,7 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
 
     def post_webhook(fixture_name, webhook_topic)
       body = webhook_fixture(fixture_name)
-      post(webhooks_url, body, {
-        HTTP_X_SHOPIFY_TOPIC: webhook_topic,
-        HTTP_X_SHOPIFY_SHOP_DOMAIN: @shop.shopify_domain,
-        HTTP_X_SHOPIFY_HMAC_SHA256: DiscoApp::WebhookService.calculated_hmac(body, ShopifyApp.configuration.secret)
-      })
+      post webhooks_url, params: body, headers: { HTTP_X_SHOPIFY_TOPIC: webhook_topic, HTTP_X_SHOPIFY_SHOP_DOMAIN: @shop.shopify_domain, HTTP_X_SHOPIFY_HMAC_SHA256: DiscoApp::WebhookService.calculated_hmac(body, ShopifyApp.configuration.secret) }
     end
 
 end

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -1,17 +1,18 @@
 require 'test_helper'
 
 class DiscoApp::AppInstalledJobTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup
     @shop = disco_app_shops(:widget_store)
 
-    stub_request(:get, "#{@shop.admin_url}/webhooks.json").to_return(status: 200, body: api_fixture('widget_store/webhooks').to_json)
+    stub_request(:get, "#{@shop.admin_url}/webhooks.json").to_return(status: 200, body: api_fixture('widget_store/empty_webhooks').to_json)
     stub_request(:post, "#{@shop.admin_url}/webhooks.json").to_return(status: 200)
     stub_request(:get, "#{@shop.admin_url}/shop.json").to_return(status: 200, body: api_fixture('widget_store/shop').to_json)
     stub_request(:get, "#{@shop.admin_url}/carrier_services.json").to_return(status: 200, body: api_fixture('widget_store/carrier_services').to_json)
     stub_request(:post, "#{@shop.admin_url}/carrier_services.json").to_return(status: 200)
-    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").to_return(status: 200)
+    stub_request(:post, 'https://api.discolabs.com/v1/app_subscriptions.json').to_return(status: 200)
   end
 
   def teardown
@@ -20,21 +21,25 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
   end
 
   test 'app installed job performs shop update job' do
-    # Assert the main install job can be enqueued and performed.
-    perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop)
+    with_suppressed_output do
+      # Assert the main install job can be enqueued and performed.
+      perform_enqueued_jobs do
+        DiscoApp::AppInstalledJob.perform_later(@shop)
+      end
     end
 
     # Assert the update shop job was performed.
     @shop.reload
-    assert_equal 'United States', @shop.data['country_name']
+    assert_equal 'United States', @shop.data[:country_name]
   end
 
   test 'app installed job automatically subscribes stores to the correct default plan' do
     @shop.current_subscription.destroy
 
-    perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop)
+    with_suppressed_output do
+      perform_enqueued_jobs do
+        DiscoApp::AppInstalledJob.perform_later(@shop)
+      end
     end
 
     # Assert the shop was subscribed to the development plan.
@@ -44,14 +49,28 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
   test 'app installed job automatically subscribes stores to the correct default plan with a plan code and a source' do
     @shop.current_subscription.destroy
 
-    perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop, 'PODCAST', 'smpodcast')
+    with_suppressed_output do
+      perform_enqueued_jobs do
+        DiscoApp::AppInstalledJob.perform_later(@shop, 'PODCAST', 'smp')
+      end
     end
 
     # Assert the shop was subscribed to the development plan.
     assert_equal disco_app_plans(:development), @shop.current_subscription.plan
     assert_equal disco_app_plan_codes(:podcast_dev), @shop.current_subscription.plan_code
-    assert_equal 'smpodcast', @shop.current_subscription.source
+    assert_equal 'smpodcast', @shop.current_subscription.source.name
   end
 
+  private
+
+    # Prevents the output from the webhook synchronisation from
+    # printing to STDOUT and messing up the test output
+    def with_suppressed_output
+      original_stdout = $stdout.clone
+      $stdout.reopen(File.new('/dev/null', 'w'))
+      yield
+    ensure
+      $stdout.reopen(original_stdout)
+    end
+
 end

data/test/jobs/disco_app/app_uninstalled_job_test.rb

@@ -1,11 +1,12 @@
 require 'test_helper'
 
 class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup
     @shop = disco_app_shops(:widget_store)
-    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").to_return(status: 200)
+    stub_request(:post, 'https://api.discolabs.com/v1/app_subscriptions.json').to_return(status: 200)
     perform_enqueued_jobs do
       DiscoApp::AppUninstalledJob.perform_later(@shop, {})
     end
@@ -25,6 +26,8 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
   test 'app uninstalled job can be extended using concerns' do
     assert_performed_jobs 2
     @shop.reload
-    assert_equal 'Nowhere', @shop.data['country_name'] # Assert extended method called.
+    # Assert extended method called.
+    assert_equal 'Nowhere', @shop.data[:country_name]
   end
+
 end

data/test/jobs/disco_app/send_subscription_job_test.rb

@@ -1,11 +1,12 @@
 require 'test_helper'
 
 class DiscoApp::SendSubscriptionJobTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup
     @shop = disco_app_shops(:widget_store)
-    stub_request(:post, "https://api.discolabs.com/v1/app_subscriptions.json").to_return(status: 200)
+    stub_request(:post, 'https://api.discolabs.com/v1/app_subscriptions.json').to_return(status: 200)
   end
 
   def teardown
@@ -18,7 +19,7 @@ class DiscoApp::SendSubscriptionJobTest < ActionController::TestCase
     perform_enqueued_jobs do
       DiscoApp::SendSubscriptionJob.perform_later(@shop)
     end
-    assert_requested(:post, "https://api.discolabs.com/v1/app_subscriptions.json", times: 1)
+    assert_requested(:post, 'https://api.discolabs.com/v1/app_subscriptions.json', times: 1)
   end
 
 end

data/test/jobs/disco_app/synchronise_carrier_service_job_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class DiscoApp::SynchroniseCarrierServiceJobTest < ActionController::TestCase
+
   include ActiveJob::TestHelper
 
   def setup

data/test/jobs/disco_app/synchronise_users_job_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class DiscoApp::SynchroniseUsersJobTest < ActionController::TestCase
+
+  include ActiveJob::TestHelper
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    stub_request(:get, "#{@shop.admin_url}/users.json").to_return(status: 200, body: api_fixture('widget_store/users').to_json)
+  end
+
+  def teardown
+    @shop = nil
+    WebMock.reset!
+  end
+
+  test 'Successfully synchronise users via background job' do
+    perform_enqueued_jobs do
+      DiscoApp::SynchroniseUsersJob.perform_later(@shop)
+    end
+    user = DiscoApp::User.first
+    assert_equal 'Steve', user.first_name
+    assert_equal 'Jobs', user.last_name
+    assert_equal 'steve@apple.com', user.email
+  end
+
+end