Fix rearranged schema printing (#920)

* Revert "Sort fields before printing to get a more stable diff" This reverts commit 3d8faca. * Revert "update tests" This reverts commit e0fb703.
graphql · Jun 20, 2017 · ff4338d · ff4338d
1 parent 6a85e88
commit ff4338d
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 77 deletions.
diff --git a/src/utilities/__tests__/buildASTSchema-test.js b/src/utilities/__tests__/buildASTSchema-test.js
@@ -69,13 +69,14 @@ describe('Schema Builder', () => {
       }
 
       type HelloScalars {
-        bool: Boolean
+        str: String
+        int: Int
         float: Float
         id: ID
-        int: Int
-        str: String
+        bool: Boolean
       }
-    `;
+      `;
+
     const output = cycleOutput(body);
     expect(output).to.equal(body);
   });
@@ -197,11 +198,11 @@ describe('Schema Builder', () => {
       }
 
       type HelloScalars {
-        listOfNonNullStrs: [String!]
+        nonNullStr: String!
         listOfStrs: [String]
-        nonNullListOfNonNullStrs: [String!]!
+        listOfNonNullStrs: [String!]
         nonNullListOfStrs: [String]!
-        nonNullStr: String!
+        nonNullListOfNonNullStrs: [String!]!
       }
     `;
     const output = cycleOutput(body);
@@ -216,8 +217,8 @@ describe('Schema Builder', () => {
       }
 
       type Recurse {
-        recurse: Recurse
         str: String
+        recurse: Recurse
       }
     `;
     const output = cycleOutput(body);
@@ -251,10 +252,10 @@ describe('Schema Builder', () => {
       }
 
       type Hello {
-        booleanToStr(bool: Boolean): String
+        str(int: Int): String
         floatToStr(float: Float): String
         idToStr(id: ID): String
-        str(int: Int): String
+        booleanToStr(bool: Boolean): String
         strToStr(bool: String): String
       }
     `;
@@ -451,9 +452,9 @@ describe('Schema Builder', () => {
       }
 
       type HelloScalars {
-        bool: Boolean
-        int: Int
         str: String
+        int: Int
+        bool: Boolean
       }
 
       type Mutation {
@@ -472,9 +473,9 @@ describe('Schema Builder', () => {
       }
 
       type HelloScalars {
-        bool: Boolean
-        int: Int
         str: String
+        int: Int
+        bool: Boolean
       }
 
       type Subscription {
@@ -528,9 +529,9 @@ describe('Schema Builder', () => {
       }
 
       type Query {
-        enum: MyEnum
         field1: String @deprecated
         field2: Int @deprecated(reason: "Because I said so")
+        enum: MyEnum
       }
     `;
     const output = cycleOutput(body);

diff --git a/src/utilities/__tests__/extendSchema-test.js b/src/utilities/__tests__/extendSchema-test.js
@@ -159,9 +159,9 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz {
@@ -170,16 +170,16 @@ describe('extendSchema', () => {
 
       type Foo implements SomeInterface {
         name: String
-        newField: String
         some: SomeInterface
         tree: [Foo]!
+        newField: String
       }
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -252,9 +252,9 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz {
@@ -269,9 +269,9 @@ describe('extendSchema', () => {
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -310,9 +310,9 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz {
@@ -321,9 +321,9 @@ describe('extendSchema', () => {
 
       type Foo implements SomeInterface {
         name: String
-        newField(arg1: String, arg2: NewInputObj!): String
         some: SomeInterface
         tree: [Foo]!
+        newField(arg1: String, arg2: NewInputObj!): String
       }
 
       input NewInputObj {
@@ -334,9 +334,9 @@ describe('extendSchema', () => {
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -365,9 +365,9 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz {
@@ -376,16 +376,16 @@ describe('extendSchema', () => {
 
       type Foo implements SomeInterface {
         name: String
-        newField(arg1: SomeEnum!): SomeEnum
         some: SomeInterface
         tree: [Foo]!
+        newField(arg1: SomeEnum!): SomeEnum
       }
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -415,9 +415,9 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz implements SomeInterface {
@@ -434,9 +434,9 @@ describe('extendSchema', () => {
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -491,9 +491,9 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz {
@@ -502,14 +502,14 @@ describe('extendSchema', () => {
 
       type Foo implements SomeInterface {
         name: String
-        newEnum: NewEnum
-        newInterface: NewInterface
+        some: SomeInterface
+        tree: [Foo]!
         newObject: NewObject
+        newInterface: NewInterface
+        newUnion: NewUnion
         newScalar: NewScalar
+        newEnum: NewEnum
         newTree: [Foo]!
-        newUnion: NewUnion
-        some: SomeInterface
-        tree: [Foo]!
       }
 
       enum NewEnum {
@@ -535,9 +535,9 @@ describe('extendSchema', () => {
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -570,20 +570,20 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz {
         fizz: String
       }
 
       type Foo implements SomeInterface, NewInterface {
-        baz: String
         name: String
         some: SomeInterface
         tree: [Foo]!
+        baz: String
       }
 
       interface NewInterface {
@@ -592,9 +592,9 @@ describe('extendSchema', () => {
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -638,18 +638,18 @@ describe('extendSchema', () => {
     expect(printSchema(testSchema)).to.equal(originalPrint);
     expect(printSchema(extendedSchema)).to.equal(dedent`
       type Bar implements SomeInterface {
-        foo: Foo
         name: String
         some: SomeInterface
+        foo: Foo
       }
 
       type Biz implements NewInterface, SomeInterface {
-        buzz: String
         fizz: String
+        buzz: String
         name: String
+        some: SomeInterface
         newFieldA: Int
         newFieldB: Float
-        some: SomeInterface
       }
 
       type Foo implements SomeInterface {
@@ -664,9 +664,9 @@ describe('extendSchema', () => {
 
       type Query {
         foo: Foo
+        someUnion: SomeUnion
         someEnum: SomeEnum
         someInterface(id: ID!): SomeInterface
-        someUnion: SomeUnion
       }
 
       enum SomeEnum {
@@ -729,13 +729,13 @@ describe('extendSchema', () => {
       }
 
       type Query {
-        newQueryField: Int
         queryField: String
+        newQueryField: Int
       }
 
       type Subscription {
-        newSubscriptionField: Int
         subscriptionField: String
+        newSubscriptionField: Int
       }
     `);
   });