Skip to content

Add 'sandbox-pod' command. Implement test. #1052

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
merged 9 commits into from
Oct 19, 2015
Merged

Add 'sandbox-pod' command. Implement test. #1052

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6b80de
Add 'sandbox-pod' command. Implement test.
e2l3n Oct 9, 2015
c7bf25a
Fix incorrect spacing.
e2l3n Oct 14, 2015
5bcca4c
Add OS check.
e2l3n Oct 14, 2015
a4da96c
Create new test injector. Mock 'iOSProjectService' and improve integr…
e2l3n Oct 15, 2015
64c6f0b
Change method name.
e2l3n Oct 15, 2015
39a3bec
Change import statements. Code cleanup. Use shelljs.
e2l3n Oct 15, 2015
437baab
Increase timeout to 15 000 ms.
e2l3n Oct 16, 2015
a2dfd7d
Change test injector constructor.
e2l3n Oct 16, 2015
20f4b26
Reorder declarations.
e2l3n Oct 19, 2015
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
3 changes: 2 additions & 1 deletion config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"PROXY_HOSTNAME": "127.0.0.1",
"TYPESCRIPT_COMPILER_OPTIONS": {},
"CI_LOGGER": false,
"ANDROID_DEBUG_UI_MAC": "Google Chrome"
"ANDROID_DEBUG_UI_MAC": "Google Chrome",
"USE_POD_SANDBOX": true
}
1 change: 1 addition & 0 deletions lib/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export class Configuration extends configBaseLib.ConfigBase implements IConfigur
TYPESCRIPT_COMPILER_OPTIONS = {};
USE_PROXY = false;
ANDROID_DEBUG_UI: string = null;
USE_POD_SANDBOX: boolean = true;

/*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
constructor(protected $fs: IFileSystem) {
Expand Down
1 change: 1 addition & 0 deletions lib/declarations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ interface IStaticConfig extends Config.IStaticConfig { }

interface IConfiguration extends Config.IConfig {
ANDROID_DEBUG_UI: string;
USE_POD_SANDBOX: boolean;
}

interface IApplicationPackage {
Expand Down
6 changes: 4 additions & 2 deletions lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
private $options: IOptions,
private $injector: IInjector,
$projectDataService: IProjectDataService,
private $prompter: IPrompter) {
private $prompter: IPrompter,
private $config: IConfiguration) {
super($fs, $projectData, $projectDataService);
}

Expand Down Expand Up @@ -495,7 +496,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ

private executePodInstall(): IFuture<any> {
this.$logger.info("Installing pods...");
return this.$childProcess.spawnFromEvent("pod", ["install"], "close", { cwd: this.platformData.projectRoot, stdio: 'inherit' });
let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
return this.$childProcess.spawnFromEvent(podTool, ["install"], "close", { cwd: this.platformData.projectRoot, stdio: 'inherit' });
}

private prepareFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {
Expand Down
43 changes: 32 additions & 11 deletions test/project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,20 @@ class ProjectIntegrationTest {
return projectService.createProject(projectName);
}

public getDefaultTemplatePath(): IFuture<string> {
public getDefaultTemplatePath(templateName: string): IFuture<string> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function should be renamed for example getNpmPackagePath(packageName: string)

return (() => {
let npmInstallationManager = this.testInjector.resolve("npmInstallationManager");
let fs = this.testInjector.resolve("fs");

let defaultTemplatePackageName = "tns-template-hello-world";
let cacheRoot = npmInstallationManager.getCacheRootPath();
let defaultTemplatePath = path.join(cacheRoot, defaultTemplatePackageName);
let latestVersion = npmInstallationManager.getLatestVersion(defaultTemplatePackageName).wait();
let defaultTemplatePath = path.join(cacheRoot, templateName);
let latestVersion = npmInstallationManager.getLatestVersion(templateName).wait();

if(!fs.exists(path.join(defaultTemplatePath, latestVersion)).wait()) {
npmInstallationManager.addToCache(defaultTemplatePackageName, latestVersion).wait();
npmInstallationManager.addToCache(templateName, latestVersion).wait();
}
if(!fs.exists(path.join(defaultTemplatePath, latestVersion, "package", "app")).wait()) {
npmInstallationManager.cacheUnpack(defaultTemplatePackageName, latestVersion).wait();
npmInstallationManager.cacheUnpack(templateName, latestVersion).wait();
}

return path.join(defaultTemplatePath, latestVersion, "package");
Expand Down Expand Up @@ -118,7 +117,6 @@ class ProjectIntegrationTest {
this.testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
this.testInjector.register("npm", NpmLib.NodePackageManager);
this.testInjector.register("httpClient", HttpClientLib.HttpClient);
this.testInjector.register("config", {});
this.testInjector.register("lockfile", stubs.LockFile);

this.testInjector.register("options", optionsLib.Options);
Expand All @@ -135,7 +133,7 @@ describe("Project Service Tests", () => {
let options = projectIntegrationTest.testInjector.resolve("options");

options.path = tempFolder;
options.copyFrom = projectIntegrationTest.getDefaultTemplatePath().wait();
options.copyFrom = projectIntegrationTest.getDefaultTemplatePath("tns-template-hello-world").wait();

projectIntegrationTest.createProject(projectName).wait();
projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp").wait();
Expand All @@ -147,12 +145,34 @@ describe("Project Service Tests", () => {
let options = projectIntegrationTest.testInjector.resolve("options");

options.path = tempFolder;
options.copyFrom = projectIntegrationTest.getDefaultTemplatePath().wait();
options.copyFrom = projectIntegrationTest.getDefaultTemplatePath("tns-template-hello-world").wait();
options.appid = "my.special.id";

projectIntegrationTest.createProject(projectName).wait();
projectIntegrationTest.assertProject(tempFolder, projectName, options.appid).wait();
});
it("creates valid project and tests pod sandbox", () => {
let testInjector = createTestInjector();
let fs: IFileSystem = testInjector.resolve("fs");
let config = testInjector.resolve("config");
let childProcess = testInjector.resolve("childProcess");
let projectIntegrationTest = new ProjectIntegrationTest();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tab <-> spaces issue? there's extra white space

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed incorrect spacing.

let workingFolderPath = temp.mkdirSync("ios_project");

let iosTemplatePath = path.join(projectIntegrationTest.getDefaultTemplatePath("tns-ios").wait(), "framework/");
childProcess.exec(`cp -R ${iosTemplatePath} ${workingFolderPath}`, { cwd: workingFolderPath }).wait();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use either $fs or shelljs

fs.writeFile("/tmp/Podfile/testFile.txt", "Test content.").wait();

let postInstallCommmand = `\`cat /tmp/Podfile/testFile.txt > ${workingFolderPath}/copyTestFile.txt && rm -rf /tmp/Podfile\``;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

magic constant used more than once - consider making it a symbol /tmp/Podfile

let podfileContent = `post_install do |installer_representation| ${postInstallCommmand} end`;
fs.writeFile(path.join(workingFolderPath, "Podfile"), podfileContent).wait();

let podTool = config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
childProcess.spawnFromEvent(podTool, ["install"], "close", { cwd: workingFolderPath, stdio: 'inherit' }).wait();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we call here executePodInstall function from iosProjectService? This way if we break something the test will fail.


assert.isTrue(fs.exists("/tmp/Podfile").wait());
assert.isTrue(fs.exists(path.join(workingFolderPath, "copyTestFile.txt")).wait());
});
});
});

Expand All @@ -164,7 +184,6 @@ function createTestInjector() {
testInjector.register("projectService", ProjectServiceLib.ProjectService);
testInjector.register("projectHelper", ProjectHelperLib.ProjectHelper);
testInjector.register("projectTemplatesService", stubs.ProjectTemplatesService);
testInjector.register("projectNameValidator", mockProjectNameValidator);

testInjector.register("fs", fsLib.FileSystem);
testInjector.register("projectDataService", ProjectDataServiceLib.ProjectDataService);
Expand All @@ -173,7 +192,9 @@ function createTestInjector() {

testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
testInjector.register("httpClient", HttpClientLib.HttpClient);
testInjector.register("config", {});
testInjector.register("config", {
"USE_POD_SANDBOX": true
});
testInjector.register("lockfile", stubs.LockFile);

testInjector.register("childProcess", ChildProcessLib.ChildProcess);
Expand Down