disco_app 0.13.6.pre.puma.pre.3 → 0.14.0

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -16,146 +15,140 @@ ActiveRecord::Schema.define(version: 20170606160751) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "carts", force: :cascade do |t|
-    t.integer  "shop_id",    limit: 8
-    t.string   "token"
-    t.jsonb    "data"
-    t.datetime "created_at",           null: false
-    t.datetime "updated_at",           null: false
+  create_table "carts", id: :serial, force: :cascade do |t|
+    t.bigint "shop_id"
+    t.string "token"
+    t.jsonb "data"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["token"], name: "index_carts_on_token", unique: true
   end
 
-  add_index "carts", ["token"], name: "index_carts_on_token", unique: true, using: :btree
-
   create_table "disco_app_app_settings", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "disco_app_application_charges", force: :cascade do |t|
-    t.integer  "shop_id",          limit: 8
-    t.integer  "subscription_id",  limit: 8
-    t.integer  "status",                     default: 0
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
-    t.integer  "shopify_id",       limit: 8
-    t.string   "confirmation_url"
+    t.bigint "shop_id"
+    t.bigint "subscription_id"
+    t.integer "status", default: 0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "shopify_id"
+    t.string "confirmation_url"
   end
 
   create_table "disco_app_plan_codes", force: :cascade do |t|
-    t.integer  "plan_id",           limit: 8
-    t.string   "code"
-    t.integer  "trial_period_days"
-    t.integer  "amount"
-    t.datetime "created_at",                              null: false
-    t.datetime "updated_at",                              null: false
-    t.integer  "status",                      default: 0
+    t.bigint "plan_id"
+    t.string "code"
+    t.integer "trial_period_days"
+    t.integer "amount"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "status", default: 0
   end
 
   create_table "disco_app_plans", force: :cascade do |t|
-    t.integer  "status",            default: 0
-    t.string   "name"
-    t.integer  "plan_type",         default: 0
-    t.integer  "trial_period_days"
-    t.datetime "created_at",                        null: false
-    t.datetime "updated_at",                        null: false
-    t.integer  "amount",            default: 0
-    t.string   "currency",          default: "USD"
-    t.integer  "interval",          default: 0
-    t.integer  "interval_count",    default: 1
+    t.integer "status", default: 0
+    t.string "name"
+    t.integer "plan_type", default: 0
+    t.integer "trial_period_days"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "amount", default: 0
+    t.string "currency", default: "USD"
+    t.integer "interval", default: 0
+    t.integer "interval_count", default: 1
   end
 
   create_table "disco_app_recurring_application_charges", force: :cascade do |t|
-    t.integer  "shop_id",          limit: 8
-    t.integer  "subscription_id",  limit: 8
-    t.integer  "status",                     default: 0
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
-    t.integer  "shopify_id",       limit: 8
-    t.string   "confirmation_url"
+    t.bigint "shop_id"
+    t.bigint "subscription_id"
+    t.integer "status", default: 0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "shopify_id"
+    t.string "confirmation_url"
   end
 
   create_table "disco_app_sessions", force: :cascade do |t|
-    t.string   "session_id", null: false
-    t.text     "data"
+    t.string "session_id", null: false
+    t.text "data"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.integer  "shop_id"
+    t.integer "shop_id"
+    t.index ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true
+    t.index ["updated_at"], name: "index_disco_app_sessions_on_updated_at"
   end
 
-  add_index "disco_app_sessions", ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true, using: :btree
-  add_index "disco_app_sessions", ["updated_at"], name: "index_disco_app_sessions_on_updated_at", using: :btree
-
   create_table "disco_app_shops", force: :cascade do |t|
-    t.string   "shopify_domain",              null: false
-    t.string   "shopify_token",               null: false
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
-    t.integer  "status",         default: 0
-    t.string   "domain"
-    t.string   "plan_name"
-    t.string   "name"
-    t.jsonb    "data",           default: {}
+    t.string "shopify_domain", null: false
+    t.string "shopify_token", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "status", default: 0
+    t.string "domain"
+    t.string "plan_name"
+    t.string "name"
+    t.jsonb "data", default: {}
+    t.index ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true
   end
 
-  add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree
-
   create_table "disco_app_sources", force: :cascade do |t|
-    t.string   "source"
-    t.string   "name"
+    t.string "source"
+    t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["source"], name: "index_disco_app_sources_on_source"
   end
 
-  add_index "disco_app_sources", ["source"], name: "index_disco_app_sources_on_source", using: :btree
-
   create_table "disco_app_subscriptions", force: :cascade do |t|
-    t.integer  "shop_id"
-    t.integer  "plan_id"
-    t.integer  "status"
-    t.integer  "subscription_type"
-    t.datetime "created_at",                              null: false
-    t.datetime "updated_at",                              null: false
+    t.integer "shop_id"
+    t.integer "plan_id"
+    t.integer "status"
+    t.integer "subscription_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.datetime "trial_start_at"
     t.datetime "trial_end_at"
     t.datetime "cancelled_at"
-    t.integer  "amount",                      default: 0
-    t.integer  "plan_code_id",      limit: 8
-    t.integer  "trial_period_days"
-    t.integer  "source_id",         limit: 8
+    t.integer "amount", default: 0
+    t.bigint "plan_code_id"
+    t.integer "trial_period_days"
+    t.bigint "source_id"
+    t.index ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id"
+    t.index ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id"
   end
 
-  add_index "disco_app_subscriptions", ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id", using: :btree
-  add_index "disco_app_subscriptions", ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id", using: :btree
-
   create_table "disco_app_users", force: :cascade do |t|
-    t.integer  "shop_id",    limit: 8
-    t.string   "first_name"
-    t.string   "last_name"
-    t.string   "email"
-    t.datetime "created_at",           null: false
-    t.datetime "updated_at",           null: false
+    t.bigint "shop_id"
+    t.string "first_name"
+    t.string "last_name"
+    t.string "email"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["id", "shop_id"], name: "index_disco_app_users_on_id_and_shop_id", unique: true
   end
 
-  add_index "disco_app_users", ["id", "shop_id"], name: "index_disco_app_users_on_id_and_shop_id", unique: true, using: :btree
-
-  create_table "js_configurations", force: :cascade do |t|
-    t.integer "shop_id", limit: 8
-    t.string  "label",             default: "Default"
-    t.string  "locale",            default: "en"
+  create_table "js_configurations", id: :serial, force: :cascade do |t|
+    t.bigint "shop_id"
+    t.string "label", default: "Default"
+    t.string "locale", default: "en"
   end
 
-  create_table "products", force: :cascade do |t|
-    t.integer  "shop_id",    limit: 8
-    t.jsonb    "data"
-    t.datetime "created_at",           null: false
-    t.datetime "updated_at",           null: false
+  create_table "products", id: :serial, force: :cascade do |t|
+    t.bigint "shop_id"
+    t.jsonb "data"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "widget_configurations", force: :cascade do |t|
-    t.integer "shop_id",          limit: 8
-    t.string  "label",                      default: "Default"
-    t.string  "locale",                     default: "en"
-    t.string  "background_color",           default: "#FFFFFF"
+  create_table "widget_configurations", id: :serial, force: :cascade do |t|
+    t.bigint "shop_id"
+    t.string "label", default: "Default"
+    t.string "locale", default: "en"
+    t.string "background_color", default: "#FFFFFF"
   end
 
   add_foreign_key "carts", "disco_app_shops", column: "shop_id"

data/test/fixtures/disco_app/shops.yml

@@ -3,10 +3,14 @@ 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'
 
 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'

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/integration/synchronises_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class SynchronisesTest < ActionDispatch::IntegrationTest
+  include ActiveJob::TestHelper
   fixtures :all
 
   def setup
@@ -14,7 +15,9 @@ 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)
@@ -24,7 +27,9 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
   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
@@ -33,12 +38,17 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
   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
@@ -64,11 +74,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/synchronise_webhooks_job_test.rb

@@ -5,18 +5,17 @@ class DiscoApp::SynchroniseWebhooksJobTest < ActionController::TestCase
 
   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(:post, "#{@shop.admin_url}/webhooks.json").to_return(status: 200)
   end
 
   def teardown
     @shop = nil
-
     WebMock.reset!
   end
 
   test 'webhook synchronisation job creates webhooks for all expected topics' do
+    stub_request(:get, "#{@shop.admin_url}/webhooks.json").to_return(status: 200, body: api_fixture('widget_store/webhooks').to_json)
+    stub_request(:post, "#{@shop.admin_url}/webhooks.json").to_return(status: 200)
+
     perform_enqueued_jobs do
       DiscoApp::SynchroniseWebhooksJob.perform_later(@shop)
     end
@@ -27,4 +26,17 @@ class DiscoApp::SynchroniseWebhooksJobTest < ActionController::TestCase
     end
   end
 
+  test 'returns error messages for webhooks that cannot be registered' do
+    VCR.use_cassette('webhook_failure') do
+      output = capture_io do
+        perform_enqueued_jobs do
+          DiscoApp::SynchroniseWebhooksJob.perform_later(@shop)
+        end
+      end
+
+      assert output.first.include?('Invalid topic specified.')
+      assert output.first.include?('orders/create - not registered')
+    end
+  end
+
 end

data/test/test_helper.rb

@@ -37,6 +37,19 @@ if ActiveSupport::TestCase.respond_to?(:fixture_path=)
   ActiveSupport::TestCase.fixtures :all
 end
 
+# Add VCR to allow the recording and playback of HTTP Requests and Responses
+require 'vcr'
+VCR.configure do |config|
+  config.cassette_library_dir = 'test/vcr'
+  config.hook_into :webmock
+  config.default_cassette_options = { match_requests_on: [:method, :uri, :body], decode_compressed_response: true }
+end
+
+# Minitest helpers to give a better formatted and more helpful output in Rubymine
+require 'minitest/reporters'
+require 'minitest/autorun'
+MiniTest::Reporters.use!
+
 # Set up the base test class.
 class ActiveSupport::TestCase