From b59380a08d1c0d51253be00161d7c332ac98ce20 Mon Sep 17 00:00:00 2001 From: Simon Bailey Date: Wed, 8 Jan 2014 15:27:24 +0000 Subject: [PATCH] Fixes #2 Signed-off-by: Simon Bailey --- .gitignore | 2 +- script-base.js | 4 ++-- test/test-creation.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2d1ef45..7e4ed06 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,4 @@ $RECYCLE.BIN/ # App specific node_modules/ -temp/ +temp*/ diff --git a/script-base.js b/script-base.js index 24a860c..f0510b3 100644 --- a/script-base.js +++ b/script-base.js @@ -13,7 +13,7 @@ var Generator = module.exports = function Generator() { this.appname = path.basename(process.cwd()); this.appname = this._.slugify(this._.humanize(this.appname)); - this.scriptAppName = this._.capitalize(this.appname) + generalUtils.appName(this); + this.scriptAppName = this._.camelize(this._.capitalize(this.appname)) + generalUtils.appName(this); this.classedName = this._.capitalize(this.name); if (typeof this.env.options.appPath === 'undefined') { @@ -56,4 +56,4 @@ Generator.prototype.htmlTemplate = function (src, dest) { Generator.prototype.generateSourceAndTest = function (appTemplate, testTemplate, targetDirectory) { this.appTemplate(appTemplate, path.join('scripts', targetDirectory, this._.capitalize(this.name))); this.testTemplate(testTemplate, path.join(targetDirectory, this._.capitalize(this.name))); -}; \ No newline at end of file +}; diff --git a/test/test-creation.js b/test/test-creation.js index a928c7d..f365a7b 100644 --- a/test/test-creation.js +++ b/test/test-creation.js @@ -15,7 +15,7 @@ describe('react-webpack generator', function () { '../../component', '../../main' ]; - helpers.testDirectory(path.join(__dirname, 'temp'), function (err) { + helpers.testDirectory(path.join(__dirname, 'temp-test'), function (err) { if (err) { return done(err); } @@ -42,7 +42,7 @@ describe('react-webpack generator', function () { 'karma.conf.js', 'package.json', 'package.json', - 'src/scripts/components/TempApp.js', + 'src/scripts/components/TempTestApp.js', 'test/helpers/phantomjs-shims.js', 'test/helpers/react/addons.js' ];