archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2720 from serverless/remove-unnecessary-timeouts-in-tests

Browse Source 
Remove unnecessary timeouts in tests
This commit is contained in:
Philipp Muens 2016-11-16 12:49:30 +01:00 committed by GitHub
commit ed8fee05b8
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/classes/CLI.test.js
View File

@ -271,11 +271,14 @@ describe('CLI', () => {
});
});
describe('integration tests', () => {
before(function () {
describe('Integration tests', function () {
this.timeout(0);
const that = this;
before(() => {
const tmpDir = testUtils.getTmpDirPath();
this.cwd = process.cwd();
that.cwd = process.cwd();
fse.mkdirSync(tmpDir);
process.chdir(tmpDir);
@ -286,16 +289,15 @@ describe('CLI', () => {
// Cannot rely on shebang in severless.js to invoke script using NodeJS on Windows.
const execPrefix = os.platform() === 'win32' ? 'node ' : '';
this.serverlessExec = execPrefix + path.join(serverless.config.serverlessPath,
that.serverlessExec = execPrefix + path.join(serverless.config.serverlessPath,
'..', 'bin', 'serverless');
});
after(function () { // eslint-disable-line prefer-arrow-callback
process.chdir(this.cwd);
after(() => {
process.chdir(that.cwd);
});
it('prints general --help to stdout', function (done) {
this.timeout(10000);
it('should print general --help to stdout', (done) => {
exec(`${this.serverlessExec} --help`, (err, stdout) => {
if (err) {
done(err);
@ -307,8 +309,7 @@ describe('CLI', () => {
});
});
it('prints command --help to stdout', function (done) {
this.timeout(10000);
it('should print command --help to stdout', (done) => {
exec(`${this.serverlessExec} deploy --help`, (err, stdout) => {
if (err) {
done(err);

39
lib/classes/PluginManager.test.js
View File

@ -736,27 +736,30 @@ describe('PluginManager', () => {
});
});
it('Plugin/CLI integration', function () {
this.timeout(10000);
const serverlessInstance = new Serverless();
serverlessInstance.init();
describe('Plugin / CLI integration', function () {
this.timeout(0);
// Cannot rely on shebang in severless.js to invoke script using NodeJS on Windows.
const execPrefix = os.platform() === 'win32' ? 'node ' : '';
const serverlessExec = execPrefix + path.join(serverlessInstance.config.serverlessPath,
'..', 'bin', 'serverless');
const tmpDir = testUtils.getTmpDirPath();
fse.mkdirSync(tmpDir);
const cwd = process.cwd();
process.chdir(tmpDir);
it('should expose a working integration between the CLI and the plugin system', () => {
const serverlessInstance = new Serverless();
serverlessInstance.init();
execSync(`${serverlessExec} create --template aws-nodejs`);
// Cannot rely on shebang in severless.js to invoke script using NodeJS on Windows.
const execPrefix = os.platform() === 'win32' ? 'node ' : '';
const serverlessExec = execPrefix + path.join(serverlessInstance.config.serverlessPath,
'..', 'bin', 'serverless');
const tmpDir = testUtils.getTmpDirPath();
fse.mkdirSync(tmpDir);
const cwd = process.cwd();
process.chdir(tmpDir);
expect(serverlessInstance.utils
.fileExistsSync(path.join(tmpDir, 'serverless.yml'))).to.equal(true);
expect(serverlessInstance.utils
.fileExistsSync(path.join(tmpDir, 'handler.js'))).to.equal(true);
execSync(`${serverlessExec} create --template aws-nodejs`);
process.chdir(cwd);
expect(serverlessInstance.utils
.fileExistsSync(path.join(tmpDir, 'serverless.yml'))).to.equal(true);
expect(serverlessInstance.utils
.fileExistsSync(path.join(tmpDir, 'handler.js'))).to.equal(true);
process.chdir(cwd);
});
});
});