Merge branch 'master' of github.com:graphql/graphql-js

graphql · Jul 7, 2015 · d32cb73 · d32cb73
2 parents 0d70847 + 79250c8
commit d32cb73
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 46 deletions.
diff --git a/src/executor/__tests__/executor.js b/src/executor/__tests__/executor.js
@@ -473,7 +473,7 @@ describe('Execute: Handles basic execution tasks', () => {
         ...Frag
       }
 
-      fragment Frag on DataType {
+      fragment Frag on Type {
         a,
         ...Frag
       }

diff --git a/src/language/__tests__/lexer.js b/src/language/__tests__/lexer.js
@@ -184,51 +184,6 @@ describe('Lexer', () => {
 
   it('lexes numbers', () => {
 
-    expect(
-      lexOne('"simple"')
-    ).to.deep.equal({
-      kind: TokenKind.STRING,
-      start: 0,
-      end: 8,
-      value: 'simple'
-    });
-
-    expect(
-      lexOne('" white space "')
-    ).to.deep.equal({
-      kind: TokenKind.STRING,
-      start: 0,
-      end: 15,
-      value: ' white space '
-    });
-
-    expect(
-      lexOne('"escaped \\n\\r\\b\\t\\f"')
-    ).to.deep.equal({
-      kind: TokenKind.STRING,
-      start: 0,
-      end: 20,
-      value: 'escaped \n\r\b\t\f'
-    });
-
-    expect(
-      lexOne('"slashes \\\\ \\/"')
-    ).to.deep.equal({
-      kind: TokenKind.STRING,
-      start: 0,
-      end: 15,
-      value: 'slashes \\ \/'
-    });
-
-    expect(
-      lexOne('"unicode \\u1234\\u5678\\u90AB\\uCDEF"')
-    ).to.deep.equal({
-      kind: TokenKind.STRING,
-      start: 0,
-      end: 34,
-      value: 'unicode \u1234\u5678\u90AB\uCDEF'
-    });
-
     expect(
       lexOne('4')
     ).to.deep.equal({
-Original file line number
+Diff line change
@@ Expand Up / @@ -473,7 +473,7 @@ describe('Execute: Handles basic execution tasks', () => { @@
             ...Frag
           }
-          fragment Frag on DataType {
+          fragment Frag on Type {
             a,
             ...Frag
           }
@@ Expand Down @@