Skip to content
This repository was archived by the owner on Feb 28, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ module.exports = class extends Generator {
this.fs.copyTpl(this.templatePath('test/test-server.js'), this.destinationPath('test/test-server.js'), this.options);
this.fs.copyTpl(this.templatePath('test/test-demo.js'), this.destinationPath('test/test-demo.js'), this.options);
this.fs.copyTpl(this.templatePath('_gitignore'), this.destinationPath('.gitignore'), this.options);
this.fs.copyTpl(this.templatePath('_dockerignore'), this.destinationPath('.dockerignore'), this.options);
this.fs.copyTpl(this.templatePath('cli-config.yml'), this.destinationPath('cli-config.yml'), this.options);
this.fs.copyTpl(this.templatePath('Dockerfile'), this.destinationPath('Dockerfile'), this.options);
this.fs.copyTpl(this.templatePath('Dockerfile-tools'), this.destinationPath('Dockerfile-tools'), this.options);
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions test/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// Paths to the generated files, if you move files around change paths here.
exports.file = {
gitignore: '.gitignore',
dockerignore: '.dockerignore',
package_json: 'package.json',
README_md: 'README.md',
server_js: 'server/server.js',
Expand Down
6 changes: 6 additions & 0 deletions test/integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,12 @@ describe('core-node-express:app integration test with custom bluemix and spec',
assert.fileContent(common.file.gitignore, 'node_modules');
});
});

describe(common.file.dockerignore, function () {
it('contains node_modules', function () {
assert.fileContent(common.file.dockerignore, 'node_modules');
});
});
});

describe('core-node-express:app integration test with isDeployableContainer spec', function() {
Expand Down