Merge pull request #1846 from artsy/copy-v1-to-v2

Duplicate V2

src/lib/stitching/convection/__tests__/stitching.test.ts

@@ -2,9 +2,10 @@ import { incrementalMergeSchemas } from "../../mergeSchemas"
 import { graphql } from "graphql"
 import gql from "lib/gql"
 import { addMockFunctionsToSchema } from "graphql-tools"
+import schema from "schema/v1/schema"
 
 it("resolves an Artist on a Consignment Submission", async () => {
-  const allMergedSchemas = await incrementalMergeSchemas({
+  const allMergedSchemas = await incrementalMergeSchemas(schema, {
     ENABLE_CONSIGNMENTS_STITCHING: true,
   })
 

src/lib/stitching/mergeSchemas.ts

@@ -10,7 +10,6 @@ import { executableKawsSchema } from "lib/stitching/kaws/schema"
 import { kawsStitchingEnvironment } from "lib/stitching/kaws/stitching"
 import config from "config"
 
-import localSchema from "schema/v1/schema"
 import { GraphQLSchema } from "graphql"
 import { exchangeStitchingEnvironment } from "./exchange/stitching"
 import { executableVortexSchema } from "lib/stitching/vortex/schema"
@@ -19,7 +18,7 @@ import { vortexStitchingEnvironment } from "./vortex/stitching"
 /**
  * Incrementally merges in schemas according to `process.env`
  */
-export const incrementalMergeSchemas = (testConfig?: any) => {
+export const incrementalMergeSchemas = (localSchema, testConfig?: any) => {
   const environment = testConfig || config
 
   const {

src/schema/v1/__tests__/article.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("Article type", () => {
   let article = null

src/schema/v1/__tests__/articles.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("Articles type", () => {
   let context = null

src/schema/v1/__tests__/artists.test.js

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 import { find } from "lodash"
 

src/schema/v1/__tests__/artworkAttributionClasses.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("ArtworkAttributionClasses type", () => {
   it("fetches artworkAttributionClasses", () => {

src/schema/v1/__tests__/auction_results.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 const artist = {
   id: "percy-z",

src/schema/v1/__tests__/causality_jwt.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable promise/always-return */
 import jwt from "jwt-simple"
 import { omit } from "lodash"
-import { runQuery, runAuthenticatedQuery } from "test/utils"
+import { runQuery, runAuthenticatedQuery } from "schema/v1/test/utils"
 import config from "config"
 
 const { HMAC_SECRET } = config

src/schema/v1/__tests__/city.test.ts

@@ -26,7 +26,7 @@ jest.mock("../city/cityDataSortedByDisplayPreference.json", () => mockCities)
 jest.mock("lib/all.ts")
 jest.mock("lib/sponsoredContent/data.json", () => mockSponsoredContent)
 
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 import { MAX_GRAPHQL_INT, allViaLoader as _allViaLoader } from "lib/all"
 

src/schema/v1/__tests__/collection.test.js

@@ -1,6 +1,6 @@
 import { resolve } from "path"
 import { readFileSync } from "fs"
-import { runAuthenticatedQuery } from "test/utils"
+import { runAuthenticatedQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 import { isEqual } from "lodash"
 

src/schema/v1/__tests__/credit_card.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("CreditCard type", () => {
   let creditCard: any

src/schema/v1/__tests__/ecommerce/add_initial_offer_to_order_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/offer_order.json"

src/schema/v1/__tests__/ecommerce/approve_order_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/buyer_accept_offer_mutation.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import gql from "lib/gql"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/buyer_counter_offer_mutation.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import gql from "lib/gql"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/buyer_reject_offer_mutation.test.ts

@@ -2,7 +2,7 @@ import gql from "lib/gql"
 import { OrderBuyerFields } from "./order_fields"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 
 let context

src/schema/v1/__tests__/ecommerce/confirm_pickup_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/create_offer_order_with_artwork_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"

src/schema/v1/__tests__/ecommerce/create_order_with_artwork_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"

src/schema/v1/__tests__/ecommerce/fix_failed_payment.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import gql from "lib/gql"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/fulfill_order_at_once_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"

src/schema/v1/__tests__/ecommerce/order.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable promise/always-return */
 
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"

src/schema/v1/__tests__/ecommerce/orders.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable promise/always-return */
 
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrdersJSON from "test/fixtures/exchange/orders.json"

src/schema/v1/__tests__/ecommerce/reject_order_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"

src/schema/v1/__tests__/ecommerce/seller_accept_offer_mutation.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import gql from "lib/gql"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/seller_counter_offer_mutation.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import gql from "lib/gql"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/seller_reject_offer_mutation.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import gql from "lib/gql"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/set_order_payment_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/set_order_shipping_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/ecommerce/submit_order_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"

src/schema/v1/__tests__/ecommerce/submit_order_with_offer_mutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import exchangeOrderJSON from "test/fixtures/exchange/buy_order.json"

src/schema/v1/__tests__/ecommerce/submit_pending_offer_mutation.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { sampleOrder } from "test/fixtures/results/sample_order"
 import gql from "lib/gql"
 import { mockxchange } from "test/fixtures/exchange/mockxchange"

src/schema/v1/__tests__/fair.test.js

@@ -10,7 +10,7 @@ const mockSponsoredContent = {
 jest.mock("lib/sponsoredContent/data.json", () => mockSponsoredContent)
 
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 import moment from "moment"
 

src/schema/v1/__tests__/fairs.test.js

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 
 describe("Fairs", () => {

src/schema/v1/__tests__/filter_artworks.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import { toGlobalId } from "graphql-relay"
 
 describe("Filter Artworks", () => {

src/schema/v1/__tests__/filter_sale_artworks.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("Filter Sale Artworks", () => {
   let context = null

src/schema/v1/__tests__/gene.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import trackedEntityLoaderFactory from "lib/loaders/loaders_with_authentication/tracked_entity"
 
 describe("Gene", () => {

src/schema/v1/__tests__/gene_families.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("GeneFamilies", () => {
   const api_data = [

src/schema/v1/__tests__/genes.test.js

@@ -1,5 +1,5 @@
 import { find } from "lodash"
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 
 describe("Genes", () => {

src/schema/v1/__tests__/object_identification.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable promise/always-return */
 import _ from "lodash"
 import { toGlobalId } from "graphql-relay"
-import { runQuery, runAuthenticatedQuery } from "test/utils"
+import { runQuery, runAuthenticatedQuery } from "schema/v1/test/utils"
 
 describe("Object Identification", () => {
   // TODO As we add more loaders, remove the old tests at the bottom of this file and add them here.

src/schema/v1/__tests__/ordered_set.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("OrderedSet type", () => {
   it("fetches set by id", () => {

src/schema/v1/__tests__/ordered_sets.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("OrderedSets type", () => {
   const query = `

src/schema/v1/__tests__/partner.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 
 describe("Partner type", () => {

src/schema/v1/__tests__/partner_show.test.js

@@ -1,6 +1,6 @@
 /* eslint-disable promise/always-return */
 import moment from "moment"
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("PartnerShow type", () => {
   let showData = null

src/schema/v1/__tests__/partner_show_events.test.ts

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 import moment from "moment"
 import { ResolverContext } from "types/graphql"

src/schema/v1/__tests__/partner_shows.test.js

@@ -1,6 +1,6 @@
 /* eslint-disable promise/always-return */
 
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 
 describe("PartnerShows type", () => {

src/schema/v1/__tests__/partners.test.js

@@ -1,4 +1,4 @@
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 import gql from "lib/gql"
 
 describe("Partners", () => {

src/schema/v1/__tests__/profile.test.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("Profile type", () => {
   let profileData = null

src/schema/v1/__tests__/sale_artwork.test.js

@@ -1,4 +1,4 @@
-import { runAuthenticatedQuery, runQuery } from "test/utils"
+import { runAuthenticatedQuery, runQuery } from "schema/v1/test/utils"
 
 describe("SaleArtwork type", () => {
   const saleArtwork = {

src/schema/v1/__tests__/sale_artwork_max_bid_env.test.js

@@ -3,7 +3,7 @@ import config from "config"
 // This is the key to this one file:
 config.BIDDER_POSITION_MAX_BID_AMOUNT_CENTS_LIMIT = 400000
 
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("SaleArtwork type", () => {
   const saleArtwork = {

src/schema/v1/__tests__/sale_artworks.test.js

@@ -1,6 +1,6 @@
 import _ from "lodash"
 import gql from "lib/gql"
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("Sale Artworks", () => {
   const execute = async (gravityResponse, query, context = {}) => {

src/schema/v1/__tests__/search.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runQuery } from "test/utils"
+import { runQuery } from "schema/v1/test/utils"
 
 describe("Search", () => {
   let searchResults: any

src/schema/v1/__tests__/sendFeedbackMutation.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable promise/always-return */
-import { runAuthenticatedQuery } from "test/utils"
+import { runAuthenticatedQuery } from "schema/v1/test/utils"
 
 describe("Send Feedback", () => {
   const feedback = {