solidus_graphql_api 0.1.0 → 0.3.0

data/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/solidus_graphql_api.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |spec|
 
   spec.summary = 'Solidus GraphQL API'
   spec.description = 'GraphQL comes to Solidus'
-  spec.homepage = 'https://github.com/solidusio-contrib/solidus_graphql_api'
+  spec.homepage = 'https://github.com/solidusio/solidus_graphql_api'
   spec.license = 'BSD-3-Clause'
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_graphql_api'
-  spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_graphql_api/blob/master/CHANGELOG.md'
+  spec.metadata['source_code_uri'] = 'https://github.com/solidusio/solidus_graphql_api'
+  spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_graphql_api/releases'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+  spec.required_ruby_version = Gem::Requirement.new('~> 3.0')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,15 +29,15 @@ Gem::Specification.new do |spec|
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'batch-loader', '>= 1.4.1', '< 1.6.0'
-  spec.add_dependency 'graphql', '>= 1.10', '< 1.12'
-  spec.add_dependency 'solidus_core', ['>= 2.5', '< 3']
-  spec.add_dependency 'solidus_support', '~> 0.5'
+  spec.add_dependency 'batch-loader', '~> 2.0'
+  spec.add_dependency 'graphql', '>= 1.10', '< 1.13'
+  spec.add_dependency 'solidus_core', ['>= 3.2', '< 5']
+  spec.add_dependency 'solidus_support', '~> 0.6'
 
+  spec.add_development_dependency 'graphql-docs', '~> 2.0.1'
   spec.add_development_dependency 'graphql-schema_comparator', '~> 1.0.0'
-  spec.add_development_dependency 'pry', '~> 0.13.1'
-  spec.add_development_dependency 'simplecov', '~> 0.16.1'
-  spec.add_development_dependency 'solidus_dev_support', '~> 1.5.0'
+  spec.add_development_dependency 'pry', '~> 0.14'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.4'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
-  spec.add_development_dependency 'with_model', '~> 2.1.2'
 end

data/spec/integration/mutations/checkout/add_addresses_to_checkout_spec.rb

@@ -13,19 +13,19 @@ RSpec.describe_mutation :add_addresses_to_checkout, mutation: :add_addresses_to_
     ]
   }
 
-  let(:country_id) { SolidusGraphqlApi::Schema.id_from_object(create(:country), nil, nil) }
+  let(:country_id) { SolidusGraphqlApi::Schema.id_from_object(create(:country, states_required: false), nil, nil) }
   let(:address) {
     address = build_stubbed(:address).slice(:address1, :city, :phone, :zipcode)
     address[:countryId] = country_id
     address.transform_keys! { |key| key.camelize(:lower) }
   }
-  let(:billing_address_firstname) { 'John' }
-  let(:shipping_address_firstname) { 'Jane' }
+  let(:billing_address_name) { 'John Von Doe' }
+  let(:shipping_address_name) { 'Jane Von Doe' }
   let(:mutation_variables) {
     Hash[
       input: {
-        billingAddress: address.merge(firstname: billing_address_firstname),
-        shippingAddress: address.merge(firstname: shipping_address_firstname)
+        billingAddress: address.merge(name: billing_address_name),
+        shippingAddress: address.merge(name: shipping_address_name)
       }
     ].tap do |variables|
       variables[:input][:shipToBillingAddress] = ship_to_billing_address if defined?(ship_to_billing_address)
@@ -62,16 +62,10 @@ RSpec.describe_mutation :add_addresses_to_checkout, mutation: :add_addresses_to_
       let(:response_order) { subject[:data][:addAddressesToCheckout][:order] }
 
       context 'with wrong arguments' do
-        let(:billing_address_firstname) { '' }
+        let(:billing_address_name) { '' }
 
         it { expect(response_order[:number]).to eq(current_order.number) }
-
-        if Gem::Requirement.new('>= 2.11.0.alpha').satisfied_by?(Spree.solidus_gem_version)
-          it { expect(user_errors.first[:path]).to eq(["input", "order", "billAddress", "name"]) }
-        else
-          it { expect(user_errors.first[:path]).to eq(["input", "order", "billAddress", "firstname"]) }
-        end
-
+        it { expect(user_errors.first[:path]).to eq(["input", "order", "billAddress", "name"]) }
         it { expect(user_errors.first[:message]).to eq("can't be blank") }
         it { is_expected.to_not have_key(:errors) }
       end
@@ -83,8 +77,8 @@ RSpec.describe_mutation :add_addresses_to_checkout, mutation: :add_addresses_to_
 
             it { expect(response_order[:number]).to eq(current_order.number) }
             it { expect(response_order[:state]).to eq('address') }
-            it { expect(response_order[:billingAddress][:firstname]).to eq(billing_address_firstname) }
-            it { expect(response_order[:shippingAddress][:firstname]).to eq(billing_address_firstname) }
+            it { expect(response_order[:billingAddress][:name]).to eq(billing_address_name) }
+            it { expect(response_order[:shippingAddress][:name]).to eq(billing_address_name) }
             it { expect(user_errors).to be_empty }
             it { is_expected.to_not have_key(:errors) }
           end
@@ -94,8 +88,8 @@ RSpec.describe_mutation :add_addresses_to_checkout, mutation: :add_addresses_to_
 
             it { expect(response_order[:number]).to eq(current_order.number) }
             it { expect(response_order[:state]).to eq('address') }
-            it { expect(response_order[:billingAddress][:firstname]).to eq(billing_address_firstname) }
-            it { expect(response_order[:shippingAddress][:firstname]).to eq(shipping_address_firstname) }
+            it { expect(response_order[:billingAddress][:name]).to eq(billing_address_name) }
+            it { expect(response_order[:shippingAddress][:name]).to eq(shipping_address_name) }
             it { expect(user_errors).to be_empty }
             it { is_expected.to_not have_key(:errors) }
           end
@@ -103,8 +97,8 @@ RSpec.describe_mutation :add_addresses_to_checkout, mutation: :add_addresses_to_
           describe 'is not present' do
             it { expect(response_order[:number]).to eq(current_order.number) }
             it { expect(response_order[:state]).to eq('address') }
-            it { expect(response_order[:billingAddress][:firstname]).to eq(billing_address_firstname) }
-            it { expect(response_order[:shippingAddress][:firstname]).to eq(shipping_address_firstname) }
+            it { expect(response_order[:billingAddress][:name]).to eq(billing_address_name) }
+            it { expect(response_order[:shippingAddress][:name]).to eq(shipping_address_name) }
             it { expect(user_errors).to be_empty }
             it { is_expected.to_not have_key(:errors) }
           end

data/spec/integration/mutations/checkout/apply_coupon_code_spec.rb

@@ -54,7 +54,9 @@ RSpec.describe_mutation :apply_coupon_code, mutation: :apply_coupon_code do
       context "and the given coupon code is applicable" do
         let(:flat_rate_discount) { 10.0 }
 
-        before { create(:promotion, :with_line_item_adjustment, adjustment_rate: flat_rate_discount, code: coupon_code) }
+        before {
+          create(:promotion, :with_line_item_adjustment, adjustment_rate: flat_rate_discount, code: coupon_code)
+        }
 
         it { expect(response_order[:adjustmentTotal]).to eq((-flat_rate_discount).to_s) }
         it { expect(response_order[:number]).to eq(current_order.number) }

data/spec/integration/mutations/{mark_default_address_spec.rb → mark_default_ship_address_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe_mutation :mark_default_address, mutation: :mark_default_address do
+RSpec.describe_mutation :mark_default_ship_address, mutation: :mark_default_ship_address do
   let(:mutation_context) { Hash[current_ability: Spree::Ability.new(current_user), current_user: current_user] }
   let(:mutation_variables) { Hash[input: { addressId: SolidusGraphqlApi::Schema.id_from_object(address, nil, nil) }] }
 
@@ -12,22 +12,22 @@ RSpec.describe_mutation :mark_default_address, mutation: :mark_default_address d
   context "when current user isn't present" do
     let(:current_user) { nil }
 
-    it { expect(subject[:data][:markDefaultAddress]).to be_nil }
+    it { expect(subject[:data][:markDefaultShipAddress]).to be_nil }
     it { expect(subject[:errors].first[:message]).to eq I18n.t(:"unauthorized.default") }
   end
 
   context "when current user is present" do
     context "and the given address id is wrong" do
-      it { expect(subject[:data][:markDefaultAddress]).to be_nil }
+      it { expect(subject[:data][:markDefaultShipAddress]).to be_nil }
       it { expect(subject[:errors].first[:message]).to eq I18n.t(:'activerecord.exceptions.not_found') }
     end
 
     context "and the given address id is correct" do
       before { current_user.addresses << address }
 
-      let(:default_address) { subject[:data][:markDefaultAddress][:user][:defaultAddress] }
+      let(:ship_address) { subject[:data][:markDefaultShipAddress][:user][:shipAddress] }
 
-      it { expect(default_address[:id]).to eq address.id }
+      it { expect(ship_address[:id]).to eq address.id }
     end
   end
 end

data/spec/integration/mutations/remove_from_address_book_spec.rb

@@ -31,16 +31,16 @@ RSpec.describe_mutation :remove_from_address_book, mutation: :remove_from_addres
       it { expect(user_addresses.map{ |address| address[:id] }).to_not include(address.id) }
 
       describe 'default address' do
-        let(:default_address) { subject[:data][:removeFromAddressBook][:user][:defaultAddress] }
+        let(:ship_address) { subject[:data][:removeFromAddressBook][:user][:shipAddress] }
 
         context "when address is the default" do
-          before { current_user.mark_default_address(address.id) }
+          before { current_user.mark_default_ship_address(address.id) }
 
-          it { expect(default_address).to be_nil }
+          it { expect(ship_address).to be_nil }
         end
 
         context "when address isn't the default" do
-          it { expect(default_address[:id]).to_not eq address.id }
+          it { expect(ship_address[:id]).to_not eq address.id }
         end
       end
     end

data/spec/integration/mutations/save_in_address_book_spec.rb

@@ -4,11 +4,14 @@ require 'spec_helper'
 
 RSpec.describe_mutation :save_in_address_book, mutation: :save_in_address_book do
   let(:default) { false }
+  let(:address_type) { "shipping" }
   let(:country_states_required) { false }
-  let(:address) { create(:address, firstname: "Jane", country: create(:country, states_required: country_states_required)) }
+  let(:address) {
+    create(:address, name: "Jane Von Doe", country: create(:country, states_required: country_states_required))
+  }
   let(:address_attributes) {
     {
-      firstname: address.firstname,
+      name: address.name,
       address1: address.address1,
       city: address.city,
       countryId: SolidusGraphqlApi::Schema.id_from_object(address.country, nil, nil),
@@ -21,7 +24,8 @@ RSpec.describe_mutation :save_in_address_book, mutation: :save_in_address_book d
     {
       input: {
         address: address_attributes,
-        default: default
+        default: default,
+        addressType: address_type
       }
     }
   }
@@ -35,22 +39,31 @@ RSpec.describe_mutation :save_in_address_book, mutation: :save_in_address_book d
 
   context "when current user is present" do
     let(:current_user) { create(:user) }
-    let(:default_address) { subject[:data][:saveInAddressBook][:user][:defaultAddress] }
+    let(:ship_address) { subject[:data][:saveInAddressBook][:user][:shipAddress] }
+    let(:bill_address) { subject[:data][:saveInAddressBook][:user][:billAddress] }
     let(:user_addresses) { subject[:data][:saveInAddressBook][:user][:addresses][:nodes] }
     let(:user_errors) { subject[:data][:saveInAddressBook][:errors] }
 
     context "when user doesn't have addresses" do
       context "and given attributes are correct" do
-        it { expect(default_address[:firstname]).to eq(address[:firstname]) }
+        it { expect(ship_address[:name]).to eq(address[:name]) }
+        it { expect(bill_address).to be(nil) }
         it { expect(user_addresses.count).to eq 1 }
-        it { expect(user_addresses.first[:firstname]).to eq(address[:firstname]) }
+        it { expect(user_addresses.first[:name]).to eq(address[:name]) }
         it { expect(user_errors).to be_empty }
+
+        context "when address_type is billing" do
+          let(:address_type) { "billing" }
+
+          it { expect(bill_address[:name]).to eq(address[:name]) }
+          it { expect(ship_address).to be(nil) }
+        end
       end
 
       context "and given attributes are incorrect" do
         let(:country_states_required) { true }
 
-        it { expect(default_address).to be_nil }
+        it { expect(ship_address).to be_nil }
         it { expect(user_addresses.count).to eq 0 }
         it { expect(user_errors.first[:path]).to eq ["input", "address", "state"] }
         it { expect(user_errors.first[:message]).to eq "can't be blank" }
@@ -61,26 +74,26 @@ RSpec.describe_mutation :save_in_address_book, mutation: :save_in_address_book d
       let(:current_user) { create(:user_with_addresses) }
 
       context "and given attributes are correct" do
-        it { expect(default_address).to_not be_nil }
+        it { expect(ship_address).to_not be_nil }
         it { expect(user_addresses.count).to eq 3 }
-        it { expect(user_addresses.map{ |address| address[:firstname] }).to include(address[:firstname]) }
+        it { expect(user_addresses.map{ |address| address[:name] }).to include(address[:name]) }
         it { expect(user_errors).to be_empty }
 
         context 'when default false' do
-          it { expect(default_address[:firstname]).to_not eq(address[:firstname]) }
+          it { expect(ship_address[:name]).to_not eq(address[:name]) }
         end
 
         context 'when default true' do
           let(:default) { true }
 
-          it { expect(default_address[:firstname]).to eq(address[:firstname]) }
+          it { expect(ship_address[:name]).to eq(address[:name]) }
         end
       end
 
       context "and given attributes are incorrect" do
         let(:country_states_required) { true }
 
-        it { expect(default_address).to_not be_nil }
+        it { expect(ship_address).to_not be_nil }
         it { expect(user_addresses.count).to eq 2 }
         it { expect(user_errors.first[:path]).to eq ["input", "address", "state"] }
         it { expect(user_errors.first[:message]).to eq "can't be blank" }

data/spec/integration/queries/completed_orders_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe_query :completed_orders do
     end
 
     context 'when there are some completed orders' do
-      let(:order_1) do
+      let(:order1) do
         create(
           :completed_order_with_pending_payment,
           id: 1,
@@ -21,7 +21,7 @@ RSpec.describe_query :completed_orders do
           number: 'fake order number 1'
         )
       end
-      let(:order_2) do
+      let(:order2) do
         create(
           :completed_order_with_pending_payment,
           id: 2,
@@ -30,7 +30,7 @@ RSpec.describe_query :completed_orders do
           number: 'fake order number 2'
         )
       end
-      let!(:completed_orders) { [order_1, order_2] }
+      let!(:completed_orders) { [order1, order2] }
 
       it { is_expected.to match_response('completed_orders') }
     end
@@ -44,7 +44,7 @@ RSpec.describe_query :completed_orders do
       let(:ship_address_2_state) { create :state, id: 3, country: ship_address_2_country }
       let(:bill_address_2_country) { create :country, id: 4 }
       let(:bill_address_2_state) { create :state, id: 4, country: bill_address_2_country }
-      let(:ship_address_1) do
+      let(:ship_address1) do
         create(
           :address,
           id: 1,
@@ -54,7 +54,7 @@ RSpec.describe_query :completed_orders do
           state: ship_address_1_state
         )
       end
-      let(:bill_address_1) do
+      let(:bill_address1) do
         create(
           :address,
           id: 2,
@@ -64,7 +64,7 @@ RSpec.describe_query :completed_orders do
           state: bill_address_1_state
         )
       end
-      let(:ship_address_2) do
+      let(:ship_address2) do
         create(
           :address,
           id: 3,
@@ -74,7 +74,7 @@ RSpec.describe_query :completed_orders do
           state: ship_address_2_state
         )
       end
-      let(:bill_address_2) do
+      let(:bill_address2) do
         create(
           :address,
           id: 4,
@@ -84,25 +84,25 @@ RSpec.describe_query :completed_orders do
           state: bill_address_2_state
         )
       end
-      let(:order_1) do
+      let(:order1) do
         create(
           :completed_order_with_pending_payment,
           id: 1,
           user: current_user,
-          ship_address: ship_address_1,
-          bill_address: bill_address_1
+          ship_address: ship_address1,
+          bill_address: bill_address1
         )
       end
-      let(:order_2) do
+      let(:order2) do
         create(
           :completed_order_with_pending_payment,
           id: 2,
           user: current_user,
-          ship_address: ship_address_2,
-          bill_address: bill_address_2
+          ship_address: ship_address2,
+          bill_address: bill_address2
         )
       end
-      let!(:completed_orders) { [order_1, order_2] }
+      let!(:completed_orders) { [order1, order2] }
 
       connection_field :shipping_address, query: 'completed_orders/shipping_address' do
         it { is_expected.to match_response('completed_orders/shipping_address') }
@@ -126,7 +126,11 @@ RSpec.describe_query :completed_orders do
         create :completed_order_with_pending_payment, id: 1, user: current_user
       end
 
-      it { is_expected.to match_response('completed_orders/available_payment_methods').with_args(available_payment_methods: order.available_payment_methods) }
+      it {
+        expect(subject).
+          to match_response('completed_orders/available_payment_methods').
+          with_args(available_payment_methods: order.available_payment_methods)
+      }
     end
 
     connection_field :payments, query: 'completed_orders/payments' do

data/spec/integration/queries/countries_spec.rb

@@ -9,8 +9,8 @@ RSpec.describe_query :countries, query: :countries, freeze_date: true do
     end
 
     context 'when countries exists' do
-      let!(:us_country) { create(:country, :with_states, id: 1) }
-      let!(:it_country) { create(:country, id: 2, iso: 'IT') }
+      let!(:us_country) { create(:country, :with_states, id: 1, states_required: false) }
+      let!(:it_country) { create(:country, id: 2, iso: 'IT', states_required: false) }
 
       it { is_expected.to match_response(:countries) }
     end

data/spec/integration/queries/current_order_spec.rb

@@ -10,6 +10,9 @@ RSpec.describe_query :currentOrder, query: :current_order, freeze_date: true do
   let(:variant_sku) { order.line_items.first.variant.sku }
 
   field :currentOrder do
-    it { is_expected.to match_response(:current_order).with_args(shipment_number: shipment_number, variant_sku: variant_sku) }
+    it {
+      expect(subject).to match_response(:current_order).with_args(shipment_number: shipment_number,
+                                                                  variant_sku: variant_sku)
+    }
   end
 end

data/spec/integration/queries/current_store_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe_query :currentStore, query: :current_store, freeze_date: true do
-  let!(:store) { create(:store, :with_defaults) }
+  let!(:store) { create(:store, :with_defaults, mail_from_address: 'solidus_graphql_api@example.org') }
 
   before { Spree::Config.available_currencies = ::Money::Currency.first(2) }