Clean up formatting

yeoman · Jan 11, 2014 · f41a7d1 · f41a7d1
1 parent 5c96344
commit f41a7d1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/lib/base.js b/lib/base.js
@@ -128,12 +128,10 @@ var Base = module.exports = function Base(args, options) {
   // - Current working directory
   try {
     this.appname = require(path.join(process.cwd(), 'bower.json')).name;
-  }
-  catch (e) {
+  } catch (e) {
     try {
       this.appname = require(path.join(process.cwd(), 'package.json')).name;
-    }
-    catch (e) {
+    } catch (e) {
       this.appname = this.args[0] || path.basename(process.cwd());
     }
   }

diff --git a/test/base.js b/test/base.js
@@ -48,7 +48,7 @@ describe('yeoman.generators.Base', function () {
   });
 
   describe('generator.appname', function () {
-    beforeEach(function () {
+    before(function () {
       this.createDummyGenerator = function (args) {
         return new this.Dummy(args || [], {
           resolved: 'ember:all',
@@ -60,30 +60,35 @@ describe('yeoman.generators.Base', function () {
       process.chdir(path.join(__dirname, 'temp.dev'));
     });
 
-    it('should pull app name from bower.json', function () {
+    afterEach(function () {
+      if (fs.existsSync('bower.json')) {
+        fs.unlinkSync('bower.json');
+        delete require.cache[path.join(process.cwd(), 'bower.json')];
+      }
+      if (fs.existsSync('package.json')) {
+        fs.unlinkSync('package.json');
+        delete require.cache[path.join(process.cwd(), 'package.json')];
+      }
+    });
+
+    it('is set from bower.json', function () {
       fs.writeFileSync('bower.json', '{ "name": "app-name" }');
       this.dummy = this.createDummyGenerator();
       assert.equal(this.dummy.appname, 'app name');
-
-      fs.unlinkSync('bower.json');
-      delete require.cache[path.join(process.cwd(), 'bower.json')];
     });
 
-    it('should pull app name from package.json', function () {
+    it('is set from package.json', function () {
       fs.writeFileSync('package.json', '{ "name": "package_app-name" }');
       this.dummy = this.createDummyGenerator();
       assert.equal(this.dummy.appname, 'package_app name');
-
-      fs.unlinkSync('package.json');
-      delete require.cache[path.join(process.cwd(), 'package.json')];
     });
 
-    it('should be set with the project directory', function () {
+    it('is set from the project directory', function () {
       this.dummy = this.createDummyGenerator();
       assert.equal(this.dummy.appname, 'temp dev');
     });
 
-    it('should be set from args', function () {
+    it('is set from args', function () {
       this.dummy = this.createDummyGenerator(['new-app']);
       assert.equal(this.dummy.appname, 'new app');
     });