fix: translate title and dashName correctly

tools/challenge-md-parser/translation-parser/__fixtures__/challenge-objects.js

@@ -122,11 +122,10 @@ const ENGLISH_VIDEO_CHALLENGE = {
 
 const TRANSLATED_CERTIFICATE = {
   id: '561add10cb82ac38a17513bc',
-  title: 'Responsive Web Design Certificate',
+  title: '响应式网页设计证书',
   challengeType: 7,
   isPrivate: true,
   videoUrl: '',
-  localeTitle: '响应式网页设计证书',
   tests: [
     { id: 'bd7158d8c442eddfaeb5bd18', title: 'Build a Tribute Page' },
     { id: '587d78af367417b2b2512b03', title: 'Build a Survey Form' },
@@ -151,11 +150,40 @@ const TRANSLATED_CERTIFICATE = {
 
 const TRANSLATED_CHALLENGE = {
   id: 'id',
-  title: 'Title',
+  title: 'Translated title',
+  challengeType: 0,
+  videoUrl: 'https://scrimba.com/',
+  forumTopicId: 9876,
+  tests: [
+    {
+      text: 'Translated test text',
+      testString: 'Translated assertions, should be ignored'
+    },
+    {
+      text: 'Translated test text2',
+      testString: 'Translated assertions, should be ignored2'
+    }
+  ],
+  solutions: ['Translated solution html string, should be ignored'],
+  description: 'Translated description html string',
+  instructions: 'Translated instructions html string',
+  files: [
+    {
+      key: 'indexhtml',
+      ext: 'html',
+      name: 'index',
+      contents: 'Translated seed html string, should be ignored',
+      head: 'Translated head string, should be ignored',
+      tail: 'Translated tail string, should be ignored'
+    }
+  ]
+};
+
+const TRANSLATED_CHALLENGE_NO_TITLE = {
+  id: 'id',
   challengeType: 0,
   videoUrl: 'https://scrimba.com/',
   forumTopicId: 9876,
-  localeTitle: 'Translated title',
   tests: [
     {
       text: 'Translated test text',
@@ -194,11 +222,10 @@ const TRANSLATED_VIDEO_CHALLENGE = {
 
 const WRONG_NUM_TESTS_CHALLENGE = {
   id: 'id',
-  title: 'Title',
+  title: 'Translated title',
   challengeType: 0,
   videoUrl: 'https://scrimba.com/',
   forumTopicId: 12345,
-  localeTitle: 'Translated title',
   tests: [
     {
       text: 'Translated test text',
@@ -227,5 +254,6 @@ exports.ENGLISH_CHALLENGE_NO_FILES = ENGLISH_CHALLENGE_NO_FILES;
 exports.ENGLISH_VIDEO_CHALLENGE = ENGLISH_VIDEO_CHALLENGE;
 exports.TRANSLATED_CERTIFICATE = TRANSLATED_CERTIFICATE;
 exports.TRANSLATED_CHALLENGE = TRANSLATED_CHALLENGE;
+exports.TRANSLATED_CHALLENGE_NO_TITLE = TRANSLATED_CHALLENGE_NO_TITLE;
 exports.TRANSLATED_VIDEO_CHALLENGE = TRANSLATED_VIDEO_CHALLENGE;
 exports.WRONG_NUM_TESTS_CHALLENGE = WRONG_NUM_TESTS_CHALLENGE;

tools/challenge-md-parser/translation-parser/translation-parser.js

@@ -1,3 +1,4 @@
+const { isEmpty } = require('lodash');
 const clone = require('lodash/cloneDeep');
 
 exports.translateComments = (text, lang, dict, codeLang) => {
@@ -40,14 +41,16 @@ exports.mergeChallenges = (engChal, transChal) => {
     ...engChal,
     description: transChal.description,
     instructions: transChal.instructions,
-    localeTitle: transChal.localeTitle,
+    originalTitle: engChal.title,
+    // TODO: throw in production?
+    title: isEmpty(transChal.title) ? engChal.title : transChal.title,
     forumTopicId: transChal.forumTopicId
   };
   if (!hasTests)
     throw Error(
       `Both challenges must have tests or questions.
       title: ${engChal.title}
-      localeTitle: ${transChal.localeTitle}`
+      translated title: ${transChal.title}`
     );
   // TODO: this should break the build when we go to production, but
   // not for testing.
@@ -55,7 +58,7 @@ exports.mergeChallenges = (engChal, transChal) => {
     console.error(
       `Challenges in both languages must have the same number of tests.
     title: ${engChal.title}
-    localeTitle: ${transChal.localeTitle}`
+    translated title: ${transChal.title}`
     );
     return challenge;
   }
@@ -63,7 +66,7 @@ exports.mergeChallenges = (engChal, transChal) => {
   // throw Error(
   //   `Challenges in both languages must have the same number of tests.
   // title: ${engChal.title}
-  // localeTitle: ${transChal.localeTitle}`
+  // translated title: ${transChal.title}`
   // );
 
   if (transChal.tests) {

tools/challenge-md-parser/translation-parser/translation-parser.test.js

@@ -12,6 +12,7 @@ const {
   ENGLISH_VIDEO_CHALLENGE,
   TRANSLATED_CERTIFICATE,
   TRANSLATED_CHALLENGE,
+  TRANSLATED_CHALLENGE_NO_TITLE,
   TRANSLATED_VIDEO_CHALLENGE
   // WRONG_NUM_TESTS_CHALLENGE
 } = require('./__fixtures__/challenge-objects');
@@ -22,6 +23,11 @@ const COMBINED_CHALLENGE = mergeChallenges(
   TRANSLATED_CHALLENGE
 );
 
+const COMBINED_CHALLENGE_NO_TITLE = mergeChallenges(
+  ENGLISH_CHALLENGE,
+  TRANSLATED_CHALLENGE_NO_TITLE
+);
+
 const COMBINED_CHALLENGE_TWO_SOLUTIONS = mergeChallenges(
   ENGLISH_CHALLENGE_TWO_SOLUTIONS,
   TRANSLATED_CHALLENGE
@@ -100,10 +106,19 @@ describe('translation parser', () => {
         expect(actualStrings[i]).toBe(expectedStrings[i]);
       }
     });
-    it('takes the localTitle from the second challenge', () => {
-      expect(COMBINED_CHALLENGE.localeTitle).toBe(
-        TRANSLATED_CHALLENGE.localeTitle
-      );
+    it('takes the title from the second challenge', () => {
+      expect(COMBINED_CHALLENGE.title).toBe(TRANSLATED_CHALLENGE.title);
+    });
+
+    // TODO: throw in production?
+    it("takes the first challenge's title if the second is missing", () => {
+      expect(COMBINED_CHALLENGE_NO_TITLE.title).toBe(ENGLISH_CHALLENGE.title);
+    });
+
+    // 'originalTitle' is just used to create the dashedName (which must be
+    // the same in both challenges, but only gets added after parsing)
+    it('creates originalTitle from the first challenge', () => {
+      expect(COMBINED_CHALLENGE.originalTitle).toBe(ENGLISH_CHALLENGE.title);
     });
     // TODO: reinstate this after alpha testing.
     // it('throws an error if the numbers of tests do not match', () => {