Skip to content

Commit

Permalink
style tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Jan 20, 2015
1 parent 8ef311d commit 66df157
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 35 deletions.
1 change: 0 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# editorconfig.org
root = true

[*]
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generator [![Build Status](https://secure.travis-ci.org/yeoman/generator.svg?branch=master)](http://travis-ci.org/yeoman/generator) [![Coverage Status](https://coveralls.io/repos/yeoman/generator/badge.png)](https://coveralls.io/r/yeoman/generator)
# Generator [![Build Status](https://travis-ci.org/yeoman/generator.svg?branch=master)](https://travis-ci.org/yeoman/generator) [![Coverage Status](https://coveralls.io/repos/yeoman/generator/badge.png)](https://coveralls.io/r/yeoman/generator)

> A Rails-inspired generator system that provides scaffolding for your apps.
> Rails-inspired generator system that provides scaffolding for your apps

### [Getting Started](http://yeoman.io/authoring/getting-started.html)   [API Documentation](http://yeoman.github.io/generator/)
Expand Down
7 changes: 3 additions & 4 deletions test/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ var fs = require('fs');
var os = require('os');
var path = require('path');
var sinon = require('sinon');
var generators = require('..');
var tmpdir = path.join(os.tmpdir(), 'yeoman-actions');
var TestAdapter = require('../lib/test/adapter').TestAdapter;
var generators = require('../');
var helpers = generators.test;
var assert = generators.assert;
var TestAdapter = require('../lib/test/adapter').TestAdapter;
var tmpdir = path.join(os.tmpdir(), 'yeoman-actions');

describe('generators.Base (actions/actions)', function () {
before(helpers.setUpTestDirectory(tmpdir));
Expand All @@ -17,7 +17,6 @@ describe('generators.Base (actions/actions)', function () {
var env = this.env = generators([], {}, new TestAdapter());
env.registerStub(helpers.createDummyGenerator(), 'dummy');
this.dummy = env.create('dummy');

this.fixtures = path.join(__dirname, 'fixtures');
this.dummy.sourceRoot(this.fixtures);
this.dummy.foo = 'bar';
Expand Down
4 changes: 3 additions & 1 deletion test/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ var rimraf = require('rimraf');
var through = require('through2');
var yeoman = require('yeoman-environment');
var userHome = require('user-home');

mockery.enable({
warnOnReplace: false,
warnOnUnregistered: false
});

var TestAdapter = require('../lib/test/adapter').TestAdapter;
var generators = require('..');
var generators = require('../');
var helpers = generators.test;
var assert = generators.assert;
var tmpdir = path.join(os.tmpdir(), 'yeoman-base');
Expand Down
5 changes: 2 additions & 3 deletions test/fetch.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ var path = require('path');
var tmpdir = require('os').tmpdir();
var nock = require('nock');
var yeoman = require('yeoman-environment');
var generators = require('..');
var assert = generators.assert;
var fetch = require('../lib/actions/fetch');
var TestAdapter = require('../lib/test/adapter').TestAdapter;
var generators = require('../');
var assert = generators.assert;

var tmp = path.join(tmpdir, 'yeoman-fetch');

Expand Down Expand Up @@ -51,5 +51,4 @@ describe('generators.Base (actions/fetch)', function () {
});
});
});

});
4 changes: 2 additions & 2 deletions test/generators.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ var fs = require('fs');
var os = require('os');
var events = require('events');
var file = require('file-utils');
var generators = require('..');
var sinon = require('sinon');
var generators = require('../');
var assert = generators.assert;
var helpers = generators.test;
var sinon = require('sinon');
var tmpdir = path.join(os.tmpdir(), 'yeoman-generators');

var Environment = require('yeoman-environment');
Expand Down
4 changes: 2 additions & 2 deletions test/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ var util = require('util');
var path = require('path');
var assert = require('assert');
var sinon = require('sinon');
var yeoman = require('..');
var helpers = yeoman.test;
var RunContext = require('../lib/test/run-context');
var yeoman = require('../');
var helpers = yeoman.test;
var env = yeoman();

describe('generators.test', function () {
Expand Down
6 changes: 3 additions & 3 deletions test/install.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*global describe, it, before, after, beforeEach, afterEach */
'use strict';
var yeoman = require('yeoman-environment');
var generators = require('..');
var helpers = generators.test;
var TestAdapter = require('../lib/test/adapter').TestAdapter;
var sinon = require('sinon');
var TestAdapter = require('../lib/test/adapter').TestAdapter;
var generators = require('../');
var helpers = generators.test;

var asyncStub = {
on: function (key, cb) {
Expand Down
2 changes: 1 addition & 1 deletion test/invoke.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*global describe, it, before, after, beforeEach, afterEach */
'use strict';
var yeoman = require('yeoman-environment');
var generators = require('..');
var TestAdapter = require('../lib/test/adapter').TestAdapter;
var generators = require('../');
var helpers = generators.test;
var assert = generators.assert;

Expand Down
4 changes: 2 additions & 2 deletions test/prompt-suggestion.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
var path = require('path');
var assert = require('assert');
var os = require('os');
var Storage = require('../lib/util/storage');
var promptSuggestion = require('../lib/util/prompt-suggestion');
var rimraf = require('rimraf');
var inquirer = require('inquirer');
var env = require('yeoman-environment');
var FileEditor = require('mem-fs-editor');
var Storage = require('../lib/util/storage');
var promptSuggestion = require('../lib/util/prompt-suggestion');

describe('PromptSuggestion', function () {
beforeEach(function () {
Expand Down
2 changes: 1 addition & 1 deletion test/remote.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ var fs = require('fs');
var assert = require('assert');
var yeoman = require('yeoman-environment');
var nock = require('nock');
var generators = require('..');
var TestAdapter = require('../lib/test/adapter').TestAdapter;
var generators = require('../');
var tmpdir = path.join(os.tmpdir(), 'yeoman-remote');

describe('generators.Base#remote()', function () {
Expand Down
7 changes: 3 additions & 4 deletions test/run-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ var path = require('path');
var assert = require('assert');
var sinon = require('sinon');
var inquirer = require('inquirer');
var yo = require('..');
var helpers = yo.test;
var tmpdir = path.join(os.tmpdir(), 'yeoman-run-context');

var RunContext = require('../lib/test/run-context');
var yo = require('../');
var tmpdir = path.join(os.tmpdir(), 'yeoman-run-context');
var helpers = yo.test;

describe('RunContext', function () {
beforeEach(function () {
Expand Down
3 changes: 1 addition & 2 deletions test/storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var path = require('path');
var sinon = require('sinon');
var env = require('yeoman-environment');
var Storage = require('../lib/util/storage');
var generators = require('..');
var generators = require('../');
var helpers = generators.test;
var tmpdir = path.join(os.tmpdir(), 'yeoman-storage');

Expand Down Expand Up @@ -239,5 +239,4 @@ describe('Storage', function () {
});
});
});

});
9 changes: 3 additions & 6 deletions test/user.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
/*global describe, before, it, after, before, beforeEach, afterEach */
'use strict';
var assert = require('assert');
var mkdirp = require('mkdirp');
var nock = require('nock');
var os = require('os');
var path = require('path');
var mkdirp = require('mkdirp');
var nock = require('nock');
var proxyquire = require('proxyquire');
var rimraf = require('rimraf');
var shell = require('shelljs');
var sinon = require('sinon');
var generators = require('../');
var tmpdir = path.join(os.tmpdir(), 'yeoman-user');
var generators = require('..');

describe('generators.Base#user', function () {
before(function () {
Expand Down Expand Up @@ -47,7 +47,6 @@ describe('generators.Base#user', function () {
});

describe('.git', function () {

describe('.name()', function () {
it('is the name used by git', function () {
assert.equal(this.user.git.name(), 'Yeoman');
Expand Down Expand Up @@ -112,7 +111,5 @@ describe('generators.Base#user', function () {
});
});
});

});

});
2 changes: 1 addition & 1 deletion test/wiring.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
var path = require('path');
var fs = require('fs');
var wiring = require('../lib/actions/wiring');
var yeoman = require('..');
var yeoman = require('../');
var assert = yeoman.assert;

describe('generators.Base (actions/wiring)', function () {
Expand Down

0 comments on commit 66df157

Please sign in to comment.