Jun 1, 2020 · Jun 1, 2020 · Jun 1, 2020 · Jun 1, 2020 · Jun 1, 2020
diff --git a/src/utils/parse.ts b/src/utils/parse.ts
  const parsed: Partial<T.Tutorial> = {
    version: params.config.version,
    summary: mdContent.summary,
    config: params.config.config,
    config: params.config.config || {},
    levels: [],
  };

  // add init commits
  if (params.commits.INIT && params.commits.INIT.length) {
    console.log(JSON.stringify(parsed.config?.testRunner));
    // @ts-ignore
    parsed.config.testRunner.setup = {
      ...(parsed.config?.testRunner?.setup || {}),
      commits: params.commits.INIT,
    };
  }

  // merge content and tutorial
  if (params.config.levels && params.config.levels.length) {
    parsed.levels = params.config.levels
        // add level setup commits
        const levelSetupKey = level.id;
        if (params.commits[levelSetupKey]) {
          if (!level.setup) {
            level.setup = {
              commits: [],
            };
          }
          level.setup.commits = params.commits[levelSetupKey];
          level.setup = {
            ...(level.setup || {}),
            commits: params.commits[levelSetupKey],
          };
        }

        // add level step commits
diff --git a/tests/parse.test.ts b/tests/parse.test.ts
      text: md,
      config,
      commits: {
        INIT: [""],
        L1S1Q: ["abcdef1", "123456789"],
        L1S1A: ["1fedcba", "987654321"],
        L1S2Q: ["2abcdef"],
          },
          directory: "coderoad",
          setup: {
            commits: ["abcdef1"],
            commands: [],
          },
        },
          },
          directory: "coderoad",
          setup: {
            commits: ["abcdef1"],
            commands: [],
          },
        },
    };
    expect(result.config).toEqual(expected.config);
  });

  it("should parse the tutorial config with INIT commits", () => {
    const md = `# Title

 Description.
 `;

    const config = {
      config: {
        testRunner: {
          command: "./node_modules/.bin/mocha",
          args: {
            filter: "--grep",
            tap: "--reporter=mocha-tap-reporter",
          },
          directory: "coderoad",
        },
        appVersions: {
          vscode: ">=0.7.0",
        },
        repo: {
          uri: "https://path.to/repo",
          branch: "aBranch",
        },
        dependencies: [
          {
            name: "node",
            version: ">=10",
          },
        ],
      },
    };
    const result = parse({
      text: md,
      config,
      commits: {
        INIT: ["abcdef1", "123456789"],
      },
    });
    const expected = {
      summary: {
        description: "Description.\n\nSecond description line",
      },
      config: {
        testRunner: {
          command: "./node_modules/.bin/mocha",
          args: {
            filter: "--grep",
            tap: "--reporter=mocha-tap-reporter",
          },
          directory: "coderoad",
          setup: {
            commits: ["abcdef1", "123456789"],
          },
        },
        repo: {
          uri: "https://path.to/repo",
          branch: "aBranch",
        },
        dependencies: [
          {
            name: "node",
            version: ">=10",
          },
        ],
        appVersions: {
          vscode: ">=0.7.0",
        },
      },
    };
    expect(result.config).toEqual(expected.config);
  });
 });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,10 +100,20 @@ export function parse(params: ParseParams): any {
		const parsed: Partial<T.Tutorial> = {
		version: params.config.version,
		summary: mdContent.summary,
		config: params.config.config,
		config: params.config.config \|\| {},
		levels: [],
		};

		// add init commits
		if (params.commits.INIT && params.commits.INIT.length) {
		console.log(JSON.stringify(parsed.config?.testRunner));
		// @ts-ignore
		parsed.config.testRunner.setup = {
		...(parsed.config?.testRunner?.setup \|\| {}),
		commits: params.commits.INIT,
		};
		}

		// merge content and tutorial
		if (params.config.levels && params.config.levels.length) {
		parsed.levels = params.config.levels
Expand All		@@ -119,12 +129,10 @@ export function parse(params: ParseParams): any {
		// add level setup commits
		const levelSetupKey = level.id;
		if (params.commits[levelSetupKey]) {
		if (!level.setup) {
		level.setup = {
		commits: [],
		};
		}
		level.setup.commits = params.commits[levelSetupKey];
		level.setup = {
		...(level.setup \|\| {}),
		commits: params.commits[levelSetupKey],
		};
		}

		// add level step commits
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -524,7 +524,6 @@ The third step
		text: md,
		config,
		commits: {
		INIT: [""],
		L1S1Q: ["abcdef1", "123456789"],
		L1S1A: ["1fedcba", "987654321"],
		L1S2Q: ["2abcdef"],
Expand DownExpand Up		@@ -685,7 +684,6 @@ Description.
		},
		directory: "coderoad",
		setup: {
		commits: ["abcdef1"],
		commands: [],
		},
		},
Expand DownExpand Up		@@ -722,7 +720,6 @@ Description.
		},
		directory: "coderoad",
		setup: {
		commits: ["abcdef1"],
		commands: [],
		},
		},
Expand All		@@ -743,4 +740,76 @@ Description.
		};
		expect(result.config).toEqual(expected.config);
		});

		it("should parse the tutorial config with INIT commits", () => {
		const md = `# Title

		Description.
		`;

		const config = {
		config: {
		testRunner: {
		command: "./node_modules/.bin/mocha",
		args: {
		filter: "--grep",
		tap: "--reporter=mocha-tap-reporter",
		},
		directory: "coderoad",
		},
		appVersions: {
		vscode: ">=0.7.0",
		},
		repo: {
		uri: "https://path.to/repo",
		branch: "aBranch",
		},
		dependencies: [
		{
		name: "node",
		version: ">=10",
		},
		],
		},
		};
		const result = parse({
		text: md,
		config,
		commits: {
		INIT: ["abcdef1", "123456789"],
		},
		});
		const expected = {
		summary: {
		description: "Description.\n\nSecond description line",
		},
		config: {
		testRunner: {
		command: "./node_modules/.bin/mocha",
		args: {
		filter: "--grep",
		tap: "--reporter=mocha-tap-reporter",
		},
		directory: "coderoad",
		setup: {
		commits: ["abcdef1", "123456789"],
		},
		},
		repo: {
		uri: "https://path.to/repo",
		branch: "aBranch",
		},
		dependencies: [
		{
		name: "node",
		version: ">=10",
		},
		],
		appVersions: {
		vscode: ">=0.7.0",
		},
		},
		};
		expect(result.config).toEqual(expected.config);
		});
		});