Skip to content

Commit f51bfc1

Browse files
committed
chore: remove unused dep, add back doctor types, use * for version in tests
1 parent 6a73de9 commit f51bfc1

File tree

4 files changed

+38
-175
lines changed

4 files changed

+38
-175
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@
163163
"latest-version": "5.1.0",
164164
"lint-staged": "^13.2.0",
165165
"mocha": "10.2.0",
166-
"should": "13.2.3",
167166
"sinon": "15.0.2",
168167
"source-map-support": "0.5.21"
169168
},
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// /// <reference path="./interfaces.ts" />
1+
/// <reference path="./interfaces.ts" />
22

3-
// declare module "@nativescript/doctor" {
4-
// export const doctor: NativeScriptDoctor.IDoctor;
5-
// export const sysInfo: NativeScriptDoctor.ISysInfo;
6-
// export const constants: NativeScriptDoctor.IConstants;
7-
// export const androidToolsInfo: NativeScriptDoctor.IAndroidToolsInfo;
8-
// export const setShouldCacheSysInfo: (shouldCache: boolean) => void;
9-
// }
3+
declare module "@nativescript/doctor" {
4+
export const doctor: NativeScriptDoctor.IDoctor;
5+
export const sysInfo: NativeScriptDoctor.ISysInfo;
6+
export const constants: NativeScriptDoctor.IConstants;
7+
export const androidToolsInfo: NativeScriptDoctor.IAndroidToolsInfo;
8+
export const setShouldCacheSysInfo: (shouldCache: boolean) => void;
9+
}

test/definitions/should.d.ts

Lines changed: 0 additions & 122 deletions
This file was deleted.

test/plugins-service.ts

Lines changed: 30 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,8 @@ async function addPluginWhenExpectingToFail(
294294
) {
295295
createProjectFile(testInjector);
296296

297-
const pluginsService: IPluginsService = testInjector.resolve(
298-
"pluginsService"
299-
);
297+
const pluginsService: IPluginsService =
298+
testInjector.resolve("pluginsService");
300299
pluginsService.getAllInstalledPlugins = async (projectData: IProjectData) => {
301300
return <any[]>[{ name: "" }];
302301
};
@@ -352,9 +351,8 @@ describe("Plugins service", () => {
352351
projectData.dependencies[pluginName] = "^1.0.0";
353352
fs.writeJson(projectFilePath, projectData);
354353

355-
const pluginsService: IPluginsService = testInjector.resolve(
356-
"pluginsService"
357-
);
354+
const pluginsService: IPluginsService =
355+
testInjector.resolve("pluginsService");
358356
pluginsService.getAllInstalledPlugins = async (
359357
projData: IProjectData
360358
) => {
@@ -413,9 +411,8 @@ describe("Plugins service", () => {
413411
};
414412

415413
// Mock pluginsService
416-
const pluginsService: IPluginsService = testInjector.resolve(
417-
"pluginsService"
418-
);
414+
const pluginsService: IPluginsService =
415+
testInjector.resolve("pluginsService");
419416
const projectData: IProjectData = testInjector.resolve("projectData");
420417
projectData.initializeProjectData();
421418
pluginsService.getAllInstalledPlugins = async (
@@ -458,9 +455,8 @@ describe("Plugins service", () => {
458455
const pluginName = "plugin1";
459456
const projectFolder = createProjectFile(testInjector);
460457

461-
const pluginsService: IPluginsService = testInjector.resolve(
462-
"pluginsService"
463-
);
458+
const pluginsService: IPluginsService =
459+
testInjector.resolve("pluginsService");
464460
pluginsService.getAllInstalledPlugins = async (
465461
projectData: IProjectData
466462
) => {
@@ -502,9 +498,8 @@ describe("Plugins service", () => {
502498
const pluginName = "plugin1";
503499
const projectFolder = createProjectFile(testInjector);
504500

505-
const pluginsService: IPluginsService = testInjector.resolve(
506-
"pluginsService"
507-
);
501+
const pluginsService: IPluginsService =
502+
testInjector.resolve("pluginsService");
508503
pluginsService.getAllInstalledPlugins = async (
509504
projectData: IProjectData
510505
) => {
@@ -560,9 +555,8 @@ describe("Plugins service", () => {
560555
pluginJsonData
561556
);
562557

563-
const pluginsService: IPluginsService = testInjector.resolve(
564-
"pluginsService"
565-
);
558+
const pluginsService: IPluginsService =
559+
testInjector.resolve("pluginsService");
566560
pluginsService.getAllInstalledPlugins = async (
567561
projectData: IProjectData
568562
) => {
@@ -610,9 +604,8 @@ describe("Plugins service", () => {
610604
pluginJsonData
611605
);
612606

613-
const pluginsService: IPluginsService = testInjector.resolve(
614-
"pluginsService"
615-
);
607+
const pluginsService: IPluginsService =
608+
testInjector.resolve("pluginsService");
616609
pluginsService.getAllInstalledPlugins = async (
617610
projectData: IProjectData
618611
) => {
@@ -652,10 +645,10 @@ describe("Plugins service", () => {
652645
platforms: {},
653646
},
654647
dependencies: {
655-
lodash: "3.8.0",
648+
lodash: "*",
656649
},
657650
devDependencies: {
658-
grunt: "0.4.2",
651+
grunt: "*",
659652
},
660653
};
661654
const fs = testInjector.resolve("fs");
@@ -664,9 +657,8 @@ describe("Plugins service", () => {
664657
pluginJsonData
665658
);
666659

667-
const pluginsService: IPluginsService = testInjector.resolve(
668-
"pluginsService"
669-
);
660+
const pluginsService: IPluginsService =
661+
testInjector.resolve("pluginsService");
670662
pluginsService.getAllInstalledPlugins = async (
671663
projectData: IProjectData
672664
) => {
@@ -765,9 +757,8 @@ describe("Plugins service", () => {
765757
unitTestsInjector.register("nodeModulesDependenciesBuilder", {});
766758
unitTestsInjector.register("tempService", stubs.TempServiceStub);
767759

768-
const pluginsService: PluginsService = unitTestsInjector.resolve(
769-
PluginsService
770-
);
760+
const pluginsService: PluginsService =
761+
unitTestsInjector.resolve(PluginsService);
771762
testData.pluginsService = pluginsService;
772763
testData.pluginData = samplePluginData;
773764
return testData;
@@ -858,9 +849,8 @@ describe("Plugins service", () => {
858849

859850
it("returns correct pluginData", () => {
860851
const unitTestsInjector = createUnitTestsInjector();
861-
const pluginsService: PluginsService = unitTestsInjector.resolve(
862-
PluginsService
863-
);
852+
const pluginsService: PluginsService =
853+
unitTestsInjector.resolve(PluginsService);
864854
const pluginData = (<any>pluginsService).convertToPluginData(
865855
dataFromPluginPackageJson,
866856
"my project dir"
@@ -879,9 +869,8 @@ describe("Plugins service", () => {
879869

880870
it("always returns lowercased platform in the path to plugins dir", () => {
881871
const unitTestsInjector = createUnitTestsInjector();
882-
const pluginsService: PluginsService = unitTestsInjector.resolve(
883-
PluginsService
884-
);
872+
const pluginsService: PluginsService =
873+
unitTestsInjector.resolve(PluginsService);
885874
const pluginData = (<any>pluginsService).convertToPluginData(
886875
dataFromPluginPackageJson,
887876
"my project dir"
@@ -1179,9 +1168,8 @@ This framework comes from nativescript-ui-core plugin, which is installed multip
11791168
for (const testCase of testCases) {
11801169
it(testCase.testName, () => {
11811170
const unitTestsInjector: IInjector = createUnitTestsInjector();
1182-
const pluginsService: IPluginsService = unitTestsInjector.resolve(
1183-
PluginsService
1184-
);
1171+
const pluginsService: IPluginsService =
1172+
unitTestsInjector.resolve(PluginsService);
11851173

11861174
if (testCase.expectedOutput instanceof Error) {
11871175
assert.throws(
@@ -1201,9 +1189,8 @@ This framework comes from nativescript-ui-core plugin, which is installed multip
12011189
);
12021190

12031191
if (testCase.expectedWarning) {
1204-
const logger = unitTestsInjector.resolve<stubs.LoggerStub>(
1205-
"logger"
1206-
);
1192+
const logger =
1193+
unitTestsInjector.resolve<stubs.LoggerStub>("logger");
12071194
assert.equal(testCase.expectedWarning + "\n", logger.warnOutput);
12081195
}
12091196

@@ -1221,9 +1208,8 @@ This framework comes from nativescript-ui-core plugin, which is installed multip
12211208

12221209
it(`caches result based on dependencies`, () => {
12231210
const unitTestsInjector: IInjector = createUnitTestsInjector();
1224-
const pluginsService: IPluginsService = unitTestsInjector.resolve(
1225-
PluginsService
1226-
);
1211+
const pluginsService: IPluginsService =
1212+
unitTestsInjector.resolve(PluginsService);
12271213
const inputDependencies = [
12281214
{
12291215
name: "nativescript-ui-core",

0 commit comments

Comments
 (0)