diff --git a/app/index.js b/app/index.js index 50ec1deed..ec954aa46 100644 --- a/app/index.js +++ b/app/index.js @@ -61,15 +61,6 @@ var AngularFullstackGenerator = yeoman.generators.Base.extend({ jasmine: true }); - // NOTE: temp(?) fix for #403 - if(typeof this.filters.oauth === 'undefined') { - var strategies = Object.keys(this.filters).filter(function(key) { - return key.match(/Auth$/) && this.filters[key]; - }.bind(this)); - - if(strategies.length) this.filters.oauth = true; - } - this.config.set('filters', this.filters); this.config.forceSave(); diff --git a/test/fixtures/.yo-rc.json b/test/fixtures/.yo-rc.json index a26821115..01d568984 100644 --- a/test/fixtures/.yo-rc.json +++ b/test/fixtures/.yo-rc.json @@ -1,20 +1,36 @@ { "generator-angular-fullstack": { - "insertRoutes": "true", + "endpointDirectory": "server/api/", + "insertRoutes": true, "registerRoutesFile": "server/routes.js", "routesNeedle": "// Insert routes below", - "insertSockets": "true", + "routesBase": "/api/", + "pluralizeRoutes": true, + "insertSockets": true, "registerSocketsFile": "server/config/socketio.js", "socketsNeedle": "// Insert sockets below", + "insertModels": true, + "registerModelsFile": "server/sqldb/index.js", + "modelsNeedle": "// Insert models below", "filters": { "coffee": true, "html": true, "less": true, "uirouter": true, + "bootstrap": false, + "uibootstrap": false, "socketio": true, - "mongoose": true, "auth": true, - "googleAuth": true + "models": true, + "mongooseModels": true, + "mongoose": true, + "oauth": true, + "googleAuth": true, + "grunt": true, + "mocha": true, + "jasmine": false, + "should": true, + "expect": false } } } diff --git a/test/test-file-creation.js b/test/test-file-creation.js index db5750900..7850fc9e4 100644 --- a/test/test-file-creation.js +++ b/test/test-file-creation.js @@ -467,28 +467,6 @@ describe('angular-fullstack generator', function () { }); }); - it('should add oauth option if existing config had oauth strategy selected', function(done) { - this.timeout(60000); - copySync(__dirname + '/fixtures/.yo-rc.json', __dirname + '/temp/.yo-rc.json'); - var gen = helpers.createGenerator('angular-fullstack:app', [ - '../../app', - '../../endpoint', - [ - helpers.createDummyGenerator(), - 'ng-component:app' - ] - ]); - gen.options['skip-install'] = true; - helpers.mockPrompt(gen, { - skipConfig: true - }); - gen.run(function () { - var yoConfig = require(__dirname + '/temp/.yo-rc.json'); - expect(yoConfig['generator-angular-fullstack'].filters.oauth).to.be.true; - done(); - }); - }); - it('should generate expected files', function (done) { gen.run(function () { helpers.assertFile(genFiles(defaultOptions));