Skip to content

fix(preview-publicApi): Add force option when getting the plugin's warnings #4267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fatme merged 1 commit into from
Jan 7, 2019
Merged

fix(preview-publicApi): Add force option when getting the plugin's warnings #4267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions lib/services/livesync/playground/preview-app-plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import { NODE_MODULES_DIR_NAME } from "../../../common/constants";
import { PLATFORMS_DIR_NAME, PACKAGE_JSON_FILE_NAME } from "../../../constants";

export class PreviewAppPluginsService implements IPreviewAppPluginsService {
private previewAppVersionWarnings: IDictionary<string[]> = {};

constructor(private $errors: IErrors,
private $fs: IFileSystem,
private $logger: ILogger,
Expand All @@ -23,20 +21,17 @@ export class PreviewAppPluginsService implements IPreviewAppPluginsService {
this.$errors.failWithoutHelp("No version of preview app provided.");
}

if (!this.previewAppVersionWarnings[device.previewAppVersion]) {
const devicePlugins = this.getDevicePlugins(device);
const localPlugins = this.getLocalPlugins(data.projectDir);
const warnings = _.keys(localPlugins)
.map(localPlugin => {
const localPluginVersion = localPlugins[localPlugin];
const devicePluginVersion = devicePlugins[localPlugin];
return this.getWarningForPlugin(data, localPlugin, localPluginVersion, devicePluginVersion, device);
})
.filter(item => !!item);
this.previewAppVersionWarnings[device.previewAppVersion] = warnings;
}

return this.previewAppVersionWarnings[device.previewAppVersion];
const devicePlugins = this.getDevicePlugins(device);
const localPlugins = this.getLocalPlugins(data.projectDir);
const warnings = _.keys(localPlugins)
.map(localPlugin => {
const localPluginVersion = localPlugins[localPlugin];
const devicePluginVersion = devicePlugins[localPlugin];
return this.getWarningForPlugin(data, localPlugin, localPluginVersion, devicePluginVersion, device);
})
.filter(item => !!item);

return warnings;
}

public async comparePluginsOnDevice(data: IPreviewAppLiveSyncData, device: Device): Promise<void> {
Expand Down
49 changes: 0 additions & 49 deletions test/services/playground/preview-app-plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,55 +86,6 @@ function setup(localPlugins: IStringDictionary, previewAppPlugins: IStringDictio

describe("previewAppPluginsService", () => {
describe("comparePluginsOnDevice without bundle", () => {
it("should persist warnings per preview app's version", async () => {
const localPlugins = {
"nativescript-facebook": "2.2.3",
"nativescript-theme-core": "1.0.4",
"tns-core-modules": "4.2.0"
};
const previewAppPlugins = {
"nativescript-theme-core": "2.0.4",
"tns-core-modules": "4.2.0"
};
const injector = createTestInjector(localPlugins);
const previewAppPluginsService = injector.resolve("previewAppPluginsService");

let isGetDevicePluginsCalled = false;
const originalGetDevicePlugins = (<any>previewAppPluginsService).getDevicePlugins;
(<any>previewAppPluginsService).getDevicePlugins = (device: Device) => {
isGetDevicePluginsCalled = true;
return originalGetDevicePlugins(device);
};
let isGetLocalPluginsCalled = false;
const originalGetLocalPlugins = (<any>previewAppPluginsService).getLocalPlugins;
(<any>previewAppPluginsService).getLocalPlugins = () => {
isGetLocalPluginsCalled = true;
return originalGetLocalPlugins.apply(previewAppPluginsService, [projectDir]);
};

const previewLiveSyncData = createPreviewLiveSyncData({ bundle: false });

await previewAppPluginsService.comparePluginsOnDevice(previewLiveSyncData, createDevice(JSON.stringify(previewAppPlugins)));

const expectedWarnings = [
util.format(PluginComparisonMessages.PLUGIN_NOT_INCLUDED_IN_PREVIEW_APP, "nativescript-facebook", deviceId),
util.format(PluginComparisonMessages.LOCAL_PLUGIN_WITH_DIFFERENCE_IN_MAJOR_VERSION, "nativescript-theme-core", "1.0.4", "2.0.4")
];
assert.isTrue(isGetDevicePluginsCalled);
assert.isTrue(isGetLocalPluginsCalled);
assert.deepEqual(warnParams, expectedWarnings);

isGetDevicePluginsCalled = false;
isGetLocalPluginsCalled = false;
warnParams = [];

await previewAppPluginsService.comparePluginsOnDevice(previewLiveSyncData, createDevice(JSON.stringify(previewAppPlugins)));

assert.isFalse(isGetDevicePluginsCalled);
assert.isFalse(isGetLocalPluginsCalled);
assert.deepEqual(warnParams, expectedWarnings);
});

const testCases = [
{
name: "should show warning for plugin not included in preview app",
Expand Down