@types/jasmine is added to package.json and path param

Author: denise-khuu

package-lock.json

@@ -9,10 +9,10 @@
     "pegjs": "^0.10.0",
     "rimraf": "^3.0.2",
     "ts-pegjs": "^0.2.7",
-    "yargs": "^16.1.0",
-    "jasmine": "^3.6.2"
+    "yargs": "^16.1.0"
   },
   "devDependencies": {
+    "@types/jasmine": "^3.6.2",
     "jasmine": "^3.6.2"
   },
   "scripts": {

package.json

@@ -79,10 +79,6 @@ export class Console extends Runner {
         return null;
     }
 
-    runCreateDevon4jProject(step: Step, command: Command): RunResult{
-        return null;
-    }
-
     async assertInstallDevonfwIde(step: Step, command: Command, result: RunResult) {
         let installedTools = command.parameters[0];
 
@@ -124,9 +120,6 @@ export class Console extends Runner {
         .fileExits(path.join(workspaceDir, command.parameters[0], "core", "src", "main", "java", "com", "example", "application", command.parameters[0], "SpringBootApp.java"));
     }
 
-    async assertCreateDevon4jProject(step: Step, command: Command, result: RunResult) {
-        console.log("assertCreateDevon4jProject");
-    }
 
     private executeCommandSync(command: string, directory: string, result: RunResult, input?: string) {
         if(result.returnCode != 0) return;

runners/console/index.ts

@@ -125,6 +125,7 @@ export class Katacoda extends Runner {
 
         // generate template to change directory, if the current directory is not equal to the required start directory
        let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw"));
+       let cdTarget = this.changeCurrentDir(path.join(command.parameters[1]));
 
        this.steps.push({
            "title": "Create a new project",
@@ -134,8 +135,8 @@ export class Katacoda extends Runner {
         //update current directory
        this.currentDir = path.join(this.currentDir, "workspace", "main"); 
 
-       this.renderTemplate("createDevon4jProject.md", this.outputPathTutorial + "step" + (this.stepsCount++) + ".md", { text: step.text, textAfter: step.textAfter, cdCommand: cdCommand, name : command.parameters[0] });
-       return null; 
+       this.renderTemplate("createDevon4jProject.md", this.outputPathTutorial + "step" + (this.stepsCount++) + ".md", { text: step.text, textAfter: step.textAfter, cdCommand: cdCommand, cdTarget: cdTarget, name : command.parameters[0]});
+       return null;  
     }
 
     private renderTemplate(name: string, targetPath: string, variables) {

runners/katacoda/index.ts

@@ -4,8 +4,8 @@
 
 <%= cdCommand; %>
 
-Navigate to the 'workspaces/main/' folder in your devonfw installation directory.
-`cd workspaces/main/`{{execute}}
+Navigate to the right folder in your devonfw installation directory.
+<%= cdTarget; %>
 
 Now you can use devonfw to setup a java project for you by executing the following devon command.
 `devon java create com.example.application.<%= name; %>`{{execute}}

runners/katacoda/templates/createDevon4jProject.md

@@ -1,24 +1,24 @@
-import * as jasmine from 'jasmine'; 
+import 'jasmine';
 import * as path from 'path';
 import { DirUtils } from '../../../runners/katacoda/dirUtils';
 
-jasmine.describe("DirUtils", () => {
+describe("DirUtils", () => {
   let target = new DirUtils();
-  jasmine.describe("changeCurrentDir", () => {
-    jasmine.it("is already in the right folder", () => {
-      jasmine.expect(target.getCdParam(path.join('/root'), path.join('/root'))).toBe('');
+  describe("changeCurrentDir", () => {
+    it("is already in the right folder", () => {
+      expect(target.getCdParam(path.join('/root'), path.join('/root'))).toBe('');
     });
-    jasmine.it("changes directly to the child folder, because currentDir is the prefix of dir", () => {
-      jasmine.expect(target.getCdParam(path.join('/root/devonfw'), path.join('/root/devonfw/setup'))).toBe(path.join('setup'));
+    it("changes directly to the child folder, because currentDir is the prefix of dir", () => {
+      expect(target.getCdParam(path.join('/root/devonfw'), path.join('/root/devonfw/setup'))).toBe(path.join('setup'));
     });
-    jasmine.it("returns an absolute path, because both dirs don't have matching parent folders", () => {
-      jasmine.expect(target.getCdParam(path.join('/setup'), path.join('/root/devonfw/setup'))).toBe(path.join('/root/devonfw/setup'));
+    it("returns an absolute path, because both dirs don't have matching parent folders", () => {
+      expect(target.getCdParam(path.join('/setup'), path.join('/root/devonfw/setup'))).toBe(path.join('/root/devonfw/setup'));
     });
-    jasmine.it("changes to parent folder before changing to child folder", () => {
-      jasmine.expect(target.getCdParam(path.join('/root/devonfw'), path.join('/root/setup/folder0/folder1'))).toBe(path.join('../setup/folder0/folder1'));
+    it("changes to parent folder before changing to child folder", () => {
+      expect(target.getCdParam(path.join('/root/devonfw'), path.join('/root/setup/folder0/folder1'))).toBe(path.join('../setup/folder0/folder1'));
     });
-    jasmine.it("changes to parent folder before changing to child folder and one child folder has the same position and name", () => {
-      jasmine.expect(target.getCdParam(path.join('/root/devonfw/folder/setup'), path.join('/root/devonfw/setup/setup'))).toBe(path.join('../../setup/setup'));
+    it("changes to parent folder before changing to child folder and one child folder has the same position and name", () => {
+      expect(target.getCdParam(path.join('/root/devonfw/folder/setup'), path.join('/root/devonfw/setup/setup'))).toBe(path.join('../../setup/setup'));
     });
 
   });