Skip to content

Commit 97d4d6f

Browse files
committed
feat(gen): always use Babel
leave in supporting code for use with eventually supporting typescript
1 parent cb0e4ab commit 97d4d6f

26 files changed

+4
-70
lines changed

Diff for: app/generator.js

+4-9
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,13 @@ export default class Generator extends Base {
9090

9191
this.log('# Client\n');
9292

93-
this.prompt([{
93+
this.prompt([/*{
9494
type: 'list',
9595
name: 'script',
9696
message: 'What would you like to write scripts with?',
97-
choices: [ 'JavaScript', 'JavaScript + Babel'],
98-
filter: function( val ) {
99-
return {
100-
'JavaScript': 'js',
101-
'JavaScript + Babel': 'babel'
102-
}[val];
103-
}
104-
}, {
97+
choices: ['Babel', 'TypeScript'],
98+
filter: function(val) { return val.toLowerCase(); }
99+
}, */{
105100
type: 'list',
106101
name: 'markup',
107102
message: 'What would you like to write markup with?',
File renamed without changes.
File renamed without changes.

Diff for: test/test-file-creation.js

-61
Original file line numberDiff line numberDiff line change
@@ -724,66 +724,5 @@ describe('angular-fullstack generator', function () {
724724
}
725725

726726
});
727-
728-
describe('with no preprocessors and no server options', function() {
729-
var testOptions = {
730-
script: 'js',
731-
markup: 'html',
732-
stylesheet: 'css',
733-
router: 'ngroute',
734-
testing: 'jasmine',
735-
odms: [],
736-
auth: false,
737-
oauth: [],
738-
socketio: false,
739-
bootstrap: true,
740-
uibootstrap: true
741-
};
742-
743-
beforeEach(function(done) {
744-
helpers.mockPrompt(gen, testOptions);
745-
done();
746-
});
747-
748-
it('should run client tests successfully', function(done) {
749-
runTest('grunt test:client', this, done);
750-
});
751-
752-
it('should pass jscs', function(done) {
753-
runTest('grunt jscs', this, done);
754-
});
755-
756-
it('should pass lint', function(done) {
757-
runTest('grunt jshint', this, done);
758-
});
759-
760-
it('should run server tests successfully', function(done) {
761-
runTest('grunt test:server', this, done);
762-
});
763-
764-
it('should generate expected files', function (done) {
765-
gen.run(function () {
766-
assert.file(genFiles(testOptions));
767-
done();
768-
});
769-
});
770-
771-
it('should not generate unexpected files', function (done) {
772-
gen.run(function () {
773-
assertOnlyFiles(genFiles(testOptions), done);
774-
});
775-
});
776-
777-
if(!process.env.SKIP_E2E) {
778-
it('should run e2e tests successfully', function (done) {
779-
runTest('grunt test:e2e', this, done, 240000);
780-
});
781-
782-
//it('should run e2e tests successfully for production app', function (done) {
783-
// runTest('grunt test:e2e:prod', this, done, 240000);
784-
//});
785-
}
786-
787-
});
788727
});
789728
});

0 commit comments

Comments
 (0)