solidus_graphql_api 0.1.0 → 0.3.0

data/spec/requests/spree/graphql_controller_spec.rb

@@ -7,11 +7,24 @@ RSpec.describe Spree::GraphqlController do
 
   before { allow_any_instance_of(SolidusGraphqlApi::Context).to receive(:to_h).and_return(context) }
 
-  after { post '/graphql', headers: headers }
-
   it 'passes the right context to the schema' do
     expect(SolidusGraphqlApi::Schema).to receive(:execute).with(
       nil, hash_including(context: context)
     )
+
+    post '/graphql', headers: headers
+  end
+
+  it 'can return blob URLs on disk storage' do
+    product = create(:product)
+    product.images.create(attributes_for(:image))
+
+    post '/graphql',
+         params: {
+           query: "{ productBySlug(slug: \"#{product.slug}\") { masterVariant { images { nodes { smallUrl } } } } }"
+         },
+         headers: headers
+
+    expect(JSON.parse(response.body).dig(*%w[data productBySlug masterVariant images nodes])[0]['smallUrl']).to match('http://')
   end
 end

data/spec/spec_helper.rb

@@ -6,24 +6,22 @@ ENV['RAILS_ENV'] = 'test'
 # Run Coverage report
 require 'solidus_dev_support/rspec/coverage'
 
-require(File.expand_path('dummy/config/environment.rb', __dir__).tap { |file|
-  # Create the dummy app if it's still missing.
-  system 'bin/rake extension:test_app' unless File.exist? file
-})
+# Create the dummy app if it's still missing.
+dummy_env = "#{__dir__}/dummy/config/environment.rb"
+system 'bin/rake extension:test_app' unless File.exist? dummy_env
+require dummy_env
 
 # Requires factories and other useful helpers defined in spree_core.
-require 'solidus_dev_support/rspec/rails_helper'
-require 'pry'
+require 'solidus_dev_support/rspec/feature_helper'
 require "graphql/schema_comparator"
-require 'with_model'
 require 'timecop'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+Dir["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
 
-# Requires factories defined in lib/solidus_graphql_api/factories.rb
-require 'solidus_graphql_api/factories'
+# Requires factories defined in lib/solidus_graphql_api/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusGraphqlApi::Engine)
 
 RSpec.configure do |config|
   config.add_setting :default_freeze_date, default: "21/12/2012 12:00:00"
@@ -33,6 +31,18 @@ RSpec.configure do |config|
 
   config.infer_spec_type_from_file_location!
   config.use_transactional_fixtures = false
+
+  if defined?(ActiveStorage::Current)
+    config.before(:all) do
+      test_host = 'https://www.example.com'
+      if Rails.gem_version >= Gem::Version.new(7)
+        ActiveStorage::Current.url_options = { host: test_host }
+      else
+        ActiveStorage::Current.host = test_host
+      end
+    end
+  end
+
   config.include Helpers::Graphql
   config.include Matchers::Graphql
 
@@ -57,6 +67,4 @@ RSpec.configure do |config|
       example.run
     end
   end
-
-  config.extend WithModel
 end

data/spec/support/expected_schema.graphql

@@ -85,9 +85,8 @@ type Address implements Node {
   company: String
   country: Country!
   createdAt: ISO8601DateTime
-  firstname: String!
   id: ID!
-  lastname: String
+  name: String!
   phone: String!
   state: State
   stateName: String
@@ -140,14 +139,18 @@ input AddressInput {
   city: String!
   company: String
   countryId: ID!
-  firstname: String!
-  lastname: String
+  name: String!
   phone: String!
   stateId: ID
   stateName: String
   zipcode: String!
 }
 
+enum AddressTypeInput {
+  billing
+  shipping
+}
+
 """
 Adjustment.
 """
@@ -562,9 +565,9 @@ type ManifestItem {
 }
 
 """
-Autogenerated input type of MarkDefaultAddress
+Autogenerated input type of MarkDefaultShipAddress
 """
-input MarkDefaultAddressInput {
+input MarkDefaultShipAddressInput {
   addressId: ID!
 
   """
@@ -574,9 +577,9 @@ input MarkDefaultAddressInput {
 }
 
 """
-Autogenerated return type of MarkDefaultAddress
+Autogenerated return type of MarkDefaultShipAddress
 """
-type MarkDefaultAddressPayload {
+type MarkDefaultShipAddressPayload {
   """
   A unique identifier for the client performing the mutation.
   """
@@ -585,22 +588,102 @@ type MarkDefaultAddressPayload {
 }
 
 type Mutation {
-  addAddressesToCheckout(input: AddAddressesToCheckoutInput!): AddAddressesToCheckoutPayload
-  addPaymentToCheckout(input: AddPaymentToCheckoutInput!): AddPaymentToCheckoutPayload
-  addToCart(input: AddToCartInput!): AddToCartPayload
-  advanceCheckout(input: AdvanceCheckoutInput!): AdvanceCheckoutPayload
-  applyCouponCode(input: ApplyCouponCodeInput!): ApplyCouponCodePayload
-  completeCheckout(input: CompleteCheckoutInput!): CompleteCheckoutPayload
-  createOrder(input: CreateOrderInput!): CreateOrderPayload
-  emptyCart(input: EmptyCartInput!): EmptyCartPayload
-  markDefaultAddress(input: MarkDefaultAddressInput!): MarkDefaultAddressPayload
-  nextCheckoutState(input: NextCheckoutStateInput!): NextCheckoutStatePayload
-  removeFromAddressBook(input: RemoveFromAddressBookInput!): RemoveFromAddressBookPayload
-  removeFromCart(input: RemoveFromCartInput!): RemoveFromCartPayload
-  saveInAddressBook(input: SaveInAddressBookInput!): SaveInAddressBookPayload
-  selectShippingRate(input: SelectShippingRateInput!): SelectShippingRatePayload
-  setOrderEmail(input: SetOrderEmailInput!): SetOrderEmailPayload
-  updateCartQuantity(input: UpdateCartQuantityInput!): UpdateCartQuantityPayload
+  addAddressesToCheckout(
+    """
+    Parameters for AddAddressesToCheckout
+    """
+    input: AddAddressesToCheckoutInput!
+  ): AddAddressesToCheckoutPayload
+  addPaymentToCheckout(
+    """
+    Parameters for AddPaymentToCheckout
+    """
+    input: AddPaymentToCheckoutInput!
+  ): AddPaymentToCheckoutPayload
+  addToCart(
+    """
+    Parameters for AddToCart
+    """
+    input: AddToCartInput!
+  ): AddToCartPayload
+  advanceCheckout(
+    """
+    Parameters for AdvanceCheckout
+    """
+    input: AdvanceCheckoutInput!
+  ): AdvanceCheckoutPayload
+  applyCouponCode(
+    """
+    Parameters for ApplyCouponCode
+    """
+    input: ApplyCouponCodeInput!
+  ): ApplyCouponCodePayload
+  completeCheckout(
+    """
+    Parameters for CompleteCheckout
+    """
+    input: CompleteCheckoutInput!
+  ): CompleteCheckoutPayload
+  createOrder(
+    """
+    Parameters for CreateOrder
+    """
+    input: CreateOrderInput!
+  ): CreateOrderPayload
+  emptyCart(
+    """
+    Parameters for EmptyCart
+    """
+    input: EmptyCartInput!
+  ): EmptyCartPayload
+  markDefaultShipAddress(
+    """
+    Parameters for MarkDefaultShipAddress
+    """
+    input: MarkDefaultShipAddressInput!
+  ): MarkDefaultShipAddressPayload
+  nextCheckoutState(
+    """
+    Parameters for NextCheckoutState
+    """
+    input: NextCheckoutStateInput!
+  ): NextCheckoutStatePayload
+  removeFromAddressBook(
+    """
+    Parameters for RemoveFromAddressBook
+    """
+    input: RemoveFromAddressBookInput!
+  ): RemoveFromAddressBookPayload
+  removeFromCart(
+    """
+    Parameters for RemoveFromCart
+    """
+    input: RemoveFromCartInput!
+  ): RemoveFromCartPayload
+  saveInAddressBook(
+    """
+    Parameters for SaveInAddressBook
+    """
+    input: SaveInAddressBookInput!
+  ): SaveInAddressBookPayload
+  selectShippingRate(
+    """
+    Parameters for SelectShippingRate
+    """
+    input: SelectShippingRateInput!
+  ): SelectShippingRatePayload
+  setOrderEmail(
+    """
+    Parameters for SetOrderEmail
+    """
+    input: SetOrderEmailInput!
+  ): SetOrderEmailPayload
+  updateCartQuantity(
+    """
+    Parameters for UpdateCartQuantity
+    """
+    input: UpdateCartQuantityInput!
+  ): UpdateCartQuantityPayload
 }
 
 """
@@ -710,6 +793,7 @@ type OptionValue implements Node {
   createdAt: ISO8601DateTime
   id: ID!
   name: String!
+  optionType: OptionType!
   position: String!
   presentation: String!
   updatedAt: ISO8601DateTime
@@ -1387,6 +1471,7 @@ Autogenerated input type of SaveInAddressBook
 """
 input SaveInAddressBookInput {
   address: AddressInput!
+  addressType: AddressTypeInput = shipping
 
   """
   A unique identifier for the client performing the mutation.
@@ -1524,6 +1609,23 @@ type ShipmentEdge {
   node: Shipment
 }
 
+"""
+Shipping Method.
+"""
+type ShippingMethod implements Node {
+  adminName: String
+  availableToAll: Boolean!
+  availableToUsers: Boolean!
+  carrier: String
+  code: String
+  createdAt: ISO8601DateTime
+  id: ID!
+  name: String!
+  serviceLevel: String
+  trackingUrl: String
+  updatedAt: ISO8601DateTime
+}
+
 """
 Shipping Rate.
 """
@@ -1533,6 +1635,7 @@ type ShippingRate implements Node {
   currency: String!
   id: ID!
   selected: Boolean!
+  shippingMethod: ShippingMethod!
   updatedAt: ISO8601DateTime
 }
 
@@ -1861,7 +1964,6 @@ type User implements Node {
   billAddress: Address
   createdAt: ISO8601DateTime
   currentSignInAt: ISO8601DateTime
-  defaultAddress: Address
   email: String!
   id: ID!
   lastSignInAt: ISO8601DateTime
@@ -2067,4 +2169,4 @@ type WalletPaymentSourceEdge {
   The item at the end of the edge.
   """
   node: WalletPaymentSource
-}
+}

data/spec/support/graphql/mutations/add_addresses_to_checkout.gql

@@ -5,10 +5,10 @@ mutation ($input: AddAddressesToCheckoutInput!) {
       number
       state
       billingAddress {
-        firstname
+        name
       }
       shippingAddress {
-        firstname
+        name
       }
     },
     errors {

data/spec/support/graphql/mutations/mark_default_ship_address.gql

@@ -0,0 +1,9 @@
+mutation ($input: MarkDefaultShipAddressInput!) {
+  markDefaultShipAddress(input: $input) {
+    user {
+      shipAddress {
+        id
+      }
+    }
+  }
+}

data/spec/support/graphql/mutations/remove_from_address_book.gql

@@ -1,7 +1,7 @@
 mutation ($input: RemoveFromAddressBookInput!) {
   removeFromAddressBook(input: $input) {
     user {
-      defaultAddress {
+      shipAddress {
         id
       }
       addresses {

data/spec/support/graphql/mutations/save_in_address_book.gql

@@ -2,7 +2,7 @@ mutation ($input: SaveInAddressBookInput!) {
   saveInAddressBook(input: $input) {
     user {
       email
-      defaultAddress {
+      shipAddress {
         address1
         address2
         alternativePhone
@@ -13,8 +13,7 @@ mutation ($input: SaveInAddressBookInput!) {
           name
         }
         createdAt
-        firstname
-        lastname
+        name
         phone
         stateName
         state {
@@ -24,6 +23,9 @@ mutation ($input: SaveInAddressBookInput!) {
         updatedAt
         zipcode
       }
+      billAddress {
+        name
+      }
       addresses {
         nodes {
           address1
@@ -36,8 +38,7 @@ mutation ($input: SaveInAddressBookInput!) {
             name
           }
           createdAt
-          firstname
-          lastname
+          name
           phone
           stateName
           state {

data/spec/support/graphql/queries/completed_orders/billing_address.gql

@@ -21,8 +21,7 @@ query {
         }
         id
         createdAt
-        firstname
-        lastname
+        name
         phone
         state {
           id

data/spec/support/graphql/queries/completed_orders/shipping_address.gql

@@ -21,8 +21,7 @@ query {
         }
         id
         createdAt
-        firstname
-        lastname
+        name
         phone
         state {
           id

data/spec/support/graphql/queries/current_user.gql

@@ -18,9 +18,8 @@ query {
           updatedAt
         }
         createdAt
-        firstname
+        name
         id
-        lastname
         phone
         state {
           name
@@ -50,9 +49,8 @@ query {
         updatedAt
       }
       createdAt
-      firstname
+      name
       id
-      lastname
       phone
       state {
         name
@@ -66,7 +64,7 @@ query {
     }
     createdAt
     currentSignInAt
-    defaultAddress {
+    shipAddress {
       address1
       address2
       alternativePhone
@@ -83,9 +81,8 @@ query {
         updatedAt
       }
       createdAt
-      firstname
+      name
       id
-      lastname
       phone
       state {
         name
@@ -118,9 +115,8 @@ query {
         updatedAt
       }
       createdAt
-      firstname
+      name
       id
-      lastname
       phone
       state {
         name
@@ -159,9 +155,8 @@ query {
                 updatedAt
               }
               createdAt
-              firstname
+              name
               id
-              lastname
               phone
               state {
                 name

data/spec/support/graphql/responses/completed_orders/billing_address.json.erb

@@ -22,8 +22,7 @@
               "updatedAt": "2012-12-21T12:00:00Z"
             },
             "createdAt": "2012-12-21T12:00:00Z",
-            "firstname": "John",
-            "lastname": null,
+            "name": "John Von Doe",
             "phone": "555-555-0199",
             "state": {
               "id": 2,
@@ -57,8 +56,7 @@
               "updatedAt": "2012-12-21T12:00:00Z"
             },
             "createdAt": "2012-12-21T12:00:00Z",
-            "firstname": "John",
-            "lastname": null,
+            "name": "John Von Doe",
             "phone": "555-555-0199",
             "state": {
               "id": 4,

data/spec/support/graphql/responses/completed_orders/shipping_address.json.erb

@@ -22,8 +22,7 @@
               "updatedAt": "2012-12-21T12:00:00Z"
             },
             "createdAt": "2012-12-21T12:00:00Z",
-            "firstname": "John",
-            "lastname": null,
+            "name": "John Von Doe",
             "phone": "555-555-0199",
             "state": {
               "id": 1,
@@ -57,8 +56,7 @@
               "updatedAt": "2012-12-21T12:00:00Z"
             },
             "createdAt": "2012-12-21T12:00:00Z",
-            "firstname": "John",
-            "lastname": null,
+            "name": "John Von Doe",
             "phone": "555-555-0199",
             "state": {
               "id": 3,

data/spec/support/graphql/responses/current_store.json.erb

@@ -22,7 +22,7 @@
       },
       "default": true,
       "defaultCurrency": "USD",
-      "mailFromAddress": "spree@example.org",
+      "mailFromAddress": "solidus_graphql_api@example.org",
       "metaDescription": "store description",
       "metaKeywords": "store, metaKeywords",
       "name": "Solidus Test Store",

data/spec/support/graphql/responses/current_user.json.erb

@@ -20,9 +20,8 @@
               "updatedAt": "2012-12-21T12:00:00Z"
             },
             "createdAt": "2012-12-21T12:00:00Z",
-            "firstname": "John",
+            "name": "John Von Doe",
             "id":  1,
-            "lastname": null,
             "phone": "555-555-0199",
             "state": {
               "name": "Alabama",
@@ -51,9 +50,8 @@
               "updatedAt": "2012-12-21T12:00:00Z"
             },
             "createdAt": "2012-12-21T12:00:00Z",
-            "firstname": "John",
+            "name": "John Von Doe",
             "id": 2,
-            "lastname": null,
             "phone": "555-555-0199",
             "state": {
               "name": "Alabama",
@@ -84,9 +82,8 @@
           "updatedAt": "2012-12-21T12:00:00Z"
         },
         "createdAt": "2012-12-21T12:00:00Z",
-        "firstname": "John",
+        "name": "John Von Doe",
         "id": 2,
-        "lastname": null,
         "phone": "555-555-0199",
         "state": {
           "name": "Alabama",
@@ -100,7 +97,7 @@
       },
       "createdAt": "2012-12-21T12:00:00Z",
       "currentSignInAt": null,
-      "defaultAddress": {
+      "shipAddress": {
         "address1": "A Different Road",
         "address2": "Northwest",
         "alternativePhone": "555-555-0199",
@@ -117,9 +114,8 @@
           "updatedAt": "2012-12-21T12:00:00Z"
         },
         "createdAt": "2012-12-21T12:00:00Z",
-        "firstname": "John",
+        "name": "John Von Doe",
         "id": 1,
-        "lastname": null,
         "phone": "555-555-0199",
         "state": {
           "name": "Alabama",
@@ -152,9 +148,8 @@
           "updatedAt": "2012-12-21T12:00:00Z"
         },
         "createdAt": "2012-12-21T12:00:00Z",
-        "firstname": "John",
+        "name": "John Von Doe",
         "id": 1,
-        "lastname": null,
         "phone": "555-555-0199",
         "state": {
           "name": "Alabama",
@@ -193,9 +188,8 @@
                   "updatedAt": "2012-12-21T12:00:00Z"
                 },
                 "createdAt": "2012-12-21T12:00:00Z",
-                "firstname": "John",
+                "name": "John Von Doe",
                 "id": 1,
-                "lastname": null,
                 "phone": "555-555-0199",
                 "state": {
                   "name": "Alabama",

data/spec/support/graphql/responses/taxonomies.json.erb

@@ -16,7 +16,7 @@
                   },
                   "createdAt": "2012-12-21T12:00:00Z",
                   "description": null,
-                  "iconUrl": "/assets/default_taxon.png",
+                  "iconUrl": "<%= taxon_url %>",
                   "id": 3,
                   "metaDescription": null,
                   "metaKeywords": null,
@@ -32,7 +32,7 @@
             },
             "createdAt": "2012-12-21T12:00:00Z",
             "description": "Brand description",
-            "iconUrl": "/assets/default_taxon.png",
+            "iconUrl": "<%= brand_url %>",
             "id": 1,
             "metaDescription": "Brand meta description",
             "metaKeywords": "Brand meta keywords",
@@ -50,7 +50,7 @@
                     {
                       "createdAt": "2012-12-21T12:00:00Z",
                       "description": null,
-                      "iconUrl": "/assets/default_taxon.png",
+                      "iconUrl": "<%= taxon_url %>",
                       "id": 3,
                       "metaDescription": null,
                       "metaKeywords": null,
@@ -66,7 +66,7 @@
                 },
                 "createdAt": "2012-12-21T12:00:00Z",
                 "description": "Brand description",
-                "iconUrl": "/assets/default_taxon.png",
+                "iconUrl": "<%= brand_url %>",
                 "id": 1,
                 "metaDescription": "Brand meta description",
                 "metaKeywords": "Brand meta keywords",
@@ -82,7 +82,7 @@
                 },
                 "createdAt": "2012-12-21T12:00:00Z",
                 "description": null,
-                "iconUrl": "/assets/default_taxon.png",
+                "iconUrl": "<%= taxon_url %>",
                 "id": 3,
                 "metaDescription": null,
                 "metaKeywords": null,
@@ -108,7 +108,7 @@
             },
             "createdAt": "2012-12-21T12:00:00Z",
             "description": null,
-            "iconUrl": "/assets/default_taxon.png",
+            "iconUrl": "<%= category_url %>",
             "id": 2,
             "metaDescription": null,
             "metaKeywords": null,
@@ -126,7 +126,7 @@
                 },
                 "createdAt": "2012-12-21T12:00:00Z",
                 "description": null,
-                "iconUrl": "/assets/default_taxon.png",
+                "iconUrl": "<%= category_url %>",
                 "id": 2,
                 "metaDescription": null,
                 "metaKeywords": null,

data/spec/support/helpers/active_record.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Helpers
+  module ActiveRecord
+    def run_migrations(&block)
+      migration = Class.new(::ActiveRecord::Migration[6.1]).tap do |klass|
+        klass.define_method(:up, &block)
+      end
+      ::ActiveRecord::Migration.suppress_messages { migration.migrate(:up) }
+    end
+
+    def create_model(name, &block)
+      stub_const(name, Class.new(ApplicationRecord)).tap do |klass|
+        klass.class_eval(&block) if block_given?
+      end
+    end
+  end
+end