Remove extra hint and add unit test

Author: Robert Zhu

package.json

@@ -61,6 +61,7 @@
     "babel-plugin-transform-runtime": "6.6.0",
     "babel-preset-es2015": "6.6.0",
     "chai": "3.5.0",
+    "chai-string": "1.2.0",
     "chai-subset": "1.2.2",
     "coveralls": "2.11.9",
     "eslint": "2.7.0",

src/validation/__tests__/OverlappingFieldsCanBeMerged-test.js

@@ -7,6 +7,7 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
+import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import {
   expectPassesRule,
@@ -28,7 +29,10 @@ import {
   GraphQLString,
   GraphQLID,
 } from '../../type';
+import chai from 'chai';
+import chaiString from 'chai-string';
 
+chai.use(chaiString);
 
 describe('Validate: Overlapping fields can be merged', () => {
 
@@ -753,6 +757,15 @@ describe('Validate: Overlapping fields can be merged', () => {
       `);
     });
 
+    it('error message contains hint for alias conflict', () => {
+      // The error template should end with a hint for the user to try using
+      // different aliases.
+      const error = fieldsConflictMessage('x', 'a and b are different fields');
+      const hint = 'Use different aliases on the fields to fetch both ' +
+                   'if this was intentional.';
+      expect(error).to.endsWith(hint);
+    });
+
   });
 
 });

src/validation/rules/OverlappingFieldsCanBeMerged.js

@@ -40,15 +40,15 @@ export function fieldsConflictMessage(
   reason: ConflictReasonMessage
 ): string {
   return `Fields "${responseName}" conflict because ${reasonMessage(reason)}` +
-    '. Use aliases on the fields to fetch both if this was intentional.';
+    '. Use different aliases on the fields to fetch both if this was ' +
+    'intentional.';
 }
 
 function reasonMessage(reason: ConflictReasonMessage): string {
   if (Array.isArray(reason)) {
     return reason.map(([ responseName, subreason ]) =>
       `subfields "${responseName}" conflict because ${reasonMessage(subreason)}`
-    ).join(' and ') +
-      '. Use aliases on the fields to fetch both if this was intentional.';
+    ).join(' and ');
   }
   return reason;
 }