Skip to content

Commit

Permalink
Merge branch '1.3.x' into 2.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
damyanpetev committed Oct 16, 2018
2 parents 6ff0d9e + 61cb38c commit a9e4f8b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions lib/commands/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ const command = {
return;
}

const projConfig = ProjectConfig.getConfig().project;
const project = ProjectConfig.getConfig().project;

if (!argv.skipAnalytics) {
GoogleAnalytics.post({
t: "event",
ec: "$ig test",
ea: `e2e: ${argv.e2e};`,
cd1: projConfig.project.framework,
cd2: projConfig.project.projectType,
cd11: !!projConfig.skipGit,
cd14: projConfig.project.theme
cd1: project.framework,
cd2: project.projectType,
cd11: !!project.skipGit,
cd14: project.theme
});
}

if (argv.e2e && projConfig.framework === "angular" && projConfig.projectType === "igx-ts") {
if (argv.e2e && project.framework === "angular" && project.projectType === "igx-ts") {
Util.exec("npm run e2e", { stdio: "inherit" });
} else {
Util.exec("npm test", { stdio: "inherit" });
Expand Down

0 comments on commit a9e4f8b

Please sign in to comment.