Skip to content

Commit b569c9d

Browse files
committed
🎨 adding cypress dependency if absent in npm_dependencies
1 parent f14755b commit b569c9d

File tree

4 files changed

+31
-2
lines changed

4 files changed

+31
-2
lines changed

bin/helpers/archiver.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@ const archiveSpecs = (runSettings, filePath, excludeFiles, md5data) => {
6666
}
6767

6868
if (typeof runSettings.npm_dependencies === 'object') {
69+
if (!("cypress" in runSettings.npm_dependencies)) {
70+
logger.warn("Missing cypress not found in npm_dependencies");
71+
if ("cypress_version" in runSettings && !runSettings.cypress_version.toString().match(Constants.LATEST_VERSION_SYNTAX_REGEX)) {
72+
runSettings.npm_dependencies.cypress = runSettings.cypress_version;
73+
} else {
74+
runSettings.npm_dependencies.cypress = "latest";
75+
}
76+
logger.debug(`Adding cypress version ${runSettings.npm_dependencies.cypress} in npm_dependencies`);
77+
}
6978
Object.assign(packageJSON, {
7079
devDependencies: runSettings.npm_dependencies,
7180
});

bin/helpers/checkUploaded.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,15 @@ const checkPackageMd5 = (runSettings) => {
6161
}
6262

6363
if (typeof runSettings.npm_dependencies === 'object') {
64+
if (!("cypress" in runSettings.npm_dependencies)) {
65+
logger.warn("Missing cypress not found in npm_dependencies");
66+
if ("cypress_version" in runSettings && !runSettings.cypress_version.toString().match(Constants.LATEST_VERSION_SYNTAX_REGEX)) {
67+
runSettings.npm_dependencies.cypress = runSettings.cypress_version;
68+
} else {
69+
runSettings.npm_dependencies.cypress = "latest";
70+
}
71+
logger.warn(`Adding cypress version ${runSettings.npm_dependencies.cypress} in npm_dependencies`);
72+
}
6473
Object.assign(packageJSON, {
6574
devDependencies: utils.sortJsonKeys(runSettings.npm_dependencies),
6675
});

bin/helpers/packageInstaller.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ const setupPackageFolder = (runSettings, directoryPath) => {
2929
}
3030

3131
if (typeof runSettings.npm_dependencies === 'object') {
32+
if (!("cypress" in runSettings.npm_dependencies)) {
33+
logger.warn("Missing cypress not found in npm_dependencies");
34+
if ("cypress_version" in runSettings && !runSettings.cypress_version.toString().match(Constants.LATEST_VERSION_SYNTAX_REGEX)) {
35+
runSettings.npm_dependencies.cypress = runSettings.cypress_version;
36+
} else {
37+
runSettings.npm_dependencies.cypress = "latest";
38+
}
39+
logger.debug(`Adding cypress version ${runSettings.npm_dependencies.cypress} in npm_dependencies`);
40+
}
3241
Object.assign(packageJSON, {
3342
devDependencies: runSettings.npm_dependencies,
3443
});

test/unit/bin/helpers/packageInstaller.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ describe("packageInstaller", () => {
137137
"name": "test",
138138
"devDependencies": {
139139
"random-package-1": "1.2.3",
140-
"random-package-2": "1.2.4"
140+
"random-package-2": "1.2.4",
141+
"cypress": "latest"
141142
}
142143
})
143144
let directoryPath = "/random/path";
@@ -189,7 +190,8 @@ describe("packageInstaller", () => {
189190
"name": "test",
190191
"devDependencies": {
191192
"random-package-1": "1.2.3",
192-
"random-package-2": "1.2.4"
193+
"random-package-2": "1.2.4",
194+
"cypress": "latest"
193195
}
194196
})
195197
let directoryPath = "/random/path";

0 commit comments

Comments
 (0)