changed from 2 todo repos to a single repo with minified and unminified subdirectories

benholloway · benholloway · commit e55b39dd49e9 · 2015-03-25T12:14:02.000+11:00
diff --git a/package.json b/package.json
@@ -112,7 +112,6 @@
     "jshint-stylish": "^1.0.1",
     "ncp": "~2.0.0",
     "ps-tree": "~0.0.3",
-    "angularity-todo-es5-minified": "angularity/angularity-todo-es5#build-minified",
-    "angularity-todo-es5-unminified": "angularity/angularity-todo-es5#build-unminified"
+    "angularity-todo-es5": "angularity/angularity-todo-es5#ci-build"
   }
 }
diff --git a/test/helpers/cli-test.js b/test/helpers/cli-test.js
@@ -285,7 +285,6 @@ function factory(base) {
 
       // error in copying implies rejected async
       if (error) {
-console.log(JSON.stringify(error));
         deferred.reject(error);
       }
       // run the command
diff --git a/test/specs/tasks/build-task.js b/test/specs/tasks/build-task.js
@@ -11,7 +11,7 @@ var BUILD_FOLDER = 'app-build';
 
 function expectations(testCase) {
   var workingBuildFile = helper.getConcatenation(testCase.cwd, BUILD_FOLDER);
-  var sourceBuildFile  = helper.getConcatenation(testCase.sourceDir, BUILD_FOLDER);
+  var sourceBuildFile  = helper.getConcatenation(testCase.sourceDir, testCase.subdir, BUILD_FOLDER);
   expect(testCase.stdout).toBeTask('build');
   expect(testCase.cwd).toHaveFile('app-build/index.html');
   expect(workingBuildFile('index.html')).diffFilePatch(sourceBuildFile('index.html'));
diff --git a/test/specs/tasks/build.spec.js b/test/specs/tasks/build.spec.js
@@ -45,7 +45,8 @@ describe('The Angularity build task', function () {
 
   describe('should operate minified (by default)', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-minified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-minified' })
       .addInvocation('build')
       .addInvocation('build --unminified false')
       .addInvocation('build -u false')
@@ -55,7 +56,8 @@ describe('The Angularity build task', function () {
 
   describe('should operate unminified', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-unminified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-unminified' })
       .addInvocation('build --unminified')
       .addInvocation('build -u')
       .addInvocation('build --unminified true')
diff --git a/test/specs/tasks/css-task.js b/test/specs/tasks/css-task.js
@@ -9,7 +9,7 @@ var BUILD_FOLDER = 'app-build';
 
 function expectations(testCase) {
   var workingBuildFile = helper.getConcatenation(testCase.cwd, BUILD_FOLDER);
-  var sourceBuildFile  = helper.getConcatenation(testCase.sourceDir, BUILD_FOLDER);
+  var sourceBuildFile  = helper.getConcatenation(testCase.sourceDir, testCase.subdir, BUILD_FOLDER);
   expect(testCase.stdout).toBeTask('css');
   expect(testCase.cwd).toHaveExpectedCssExcept();
   expect(workingBuildFile('index.css')).diffFilePatch(sourceBuildFile('index.css'));
diff --git a/test/specs/tasks/css.spec.js b/test/specs/tasks/css.spec.js
@@ -43,7 +43,8 @@ describe('The Angularity css task', function () {
 
   describe('should compile css correctly', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-minified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-minified' })
       .addInvocation('css')
       .forEach(slowIt(cssTask.expectations))
       .finally(done);
diff --git a/test/specs/tasks/javascript-task.js b/test/specs/tasks/javascript-task.js
@@ -10,7 +10,7 @@ var TEST_FOLDER  = 'app-test';
 
 function expectations(testCase) {
   var workingBuildFile = helper.getConcatenation(testCase.cwd, BUILD_FOLDER);
-  var sourceBuildFile  = helper.getConcatenation(testCase.sourceDir, BUILD_FOLDER);
+  var sourceBuildFile  = helper.getConcatenation(testCase.sourceDir, testCase.subdir, BUILD_FOLDER);
   var workingTestFile  = helper.getConcatenation(testCase.cwd, TEST_FOLDER);
   var sourceTestFile   = helper.getConcatenation(testCase.sourceDir, TEST_FOLDER);
 
diff --git a/test/specs/tasks/javascript.spec.js b/test/specs/tasks/javascript.spec.js
@@ -45,7 +45,8 @@ describe('The Angularity javascript task', function () {
 
   describe('should operate minified (by default)', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-minified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-minified' })
       .addInvocation('javascript')
       .addInvocation('javascript --unminified false')
       .addInvocation('javascript -u false')
@@ -55,7 +56,8 @@ describe('The Angularity javascript task', function () {
 
   describe('should operate unminified', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-unminified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-unminified' })
       .addInvocation('javascript --unminified')
       .addInvocation('javascript -u')
       .addInvocation('javascript --unminified true')
diff --git a/test/specs/tasks/release.spec.js b/test/specs/tasks/release.spec.js
@@ -45,7 +45,8 @@ describe('The Angularity release task', function () {
 
   describe('should operate minified (by default)', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-minified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-minified' })
       .addInvocation('release')
       .addInvocation('release --unminified false')
       .addInvocation('release -u false')
@@ -55,7 +56,8 @@ describe('The Angularity release task', function () {
 
   describe('should operate unminified', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-unminified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-unminified' })
       .addInvocation('release --unminified')
       .addInvocation('release -u')
       .addInvocation('release --unminified true')
@@ -67,9 +69,9 @@ describe('The Angularity release task', function () {
 
 function expectations(testCase) {
   var workingReleaseFile = helper.getConcatenation(testCase.cwd, RELEASE_FOLDER);
-  var workingVendorFile = helper.getConcatenation(testCase.cwd, RELEASE_FOLDER, VENDOR_FOLDER);
-  var sourceReleaseFile  = helper.getConcatenation(testCase.sourceDir, RELEASE_FOLDER);
-  var sourceVendorFile  = helper.getConcatenation(testCase.sourceDir, RELEASE_FOLDER, VENDOR_FOLDER);
+  var workingVendorFile  = helper.getConcatenation(testCase.cwd, RELEASE_FOLDER, VENDOR_FOLDER);
+  var sourceReleaseFile  = helper.getConcatenation(testCase.sourceDir, testCase.subdir, RELEASE_FOLDER);
+  var sourceVendorFile   = helper.getConcatenation(testCase.sourceDir, testCase.subdir, RELEASE_FOLDER, VENDOR_FOLDER);
 
   // general
   expect(testCase.stdout).toBeTask(['release', 'build', 'javascript', 'css']);
diff --git a/test/specs/tasks/test.spec.js b/test/specs/tasks/test.spec.js
@@ -47,15 +47,17 @@ describe('The Angularity test task', function () {
 
   describe('should build unminified javascript and run tests', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-minified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-minified' })
       .addInvocation('test')
       .forEach(slowIt(expectations))
       .finally(done);
   });
 
   describe('should support unminified option, but not minify test output', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-unminified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-unminified' })
       .addInvocation('test --unminified')
       .addInvocation('test -u')
       .forEach(slowIt(expectations))
diff --git a/test/specs/tasks/watch.spec.js b/test/specs/tasks/watch.spec.js
@@ -47,7 +47,8 @@ describe('The Angularity watch task', function () {
 
   describe('should operate minified (by default)', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-minified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-minified' })
       .addInvocation('watch')
       .addInvocation('watch --unminified false')
       .addInvocation('watch -u false')
@@ -57,7 +58,8 @@ describe('The Angularity watch task', function () {
 
   describe('should operate unminified', function(done) {
     helper.runner.create()
-      .addSource('angularity-todo-es5-unminified')
+      .addSource('angularity-todo-es5')
+      .addParameters({ subdir: 'app-unminified' })
       .addInvocation('watch --unminified')
       .addInvocation('watch -u')
       .addInvocation('watch --unminified true')
diff --git a/test/specs/tasks/webstorm.spec.js b/test/specs/tasks/webstorm.spec.js
@@ -45,7 +45,7 @@ if (!platform.isAppveyor()) {
 
     describe('should fail where angularity.json is not present', function (done) {
       helper.runner.create()
-        .addSource('angularity-todo-es5-minified')
+        .addSource('angularity-todo-es5')
         .withSourceFilter(function removeBuildFiles(value) {
           return !(/angularity.json$/.test(value));
         })
@@ -60,7 +60,7 @@ if (!platform.isAppveyor()) {
 
     describe('should operate with all flags false', function (done) {
       helper.runner.create()
-        .addSource('angularity-todo-es5-minified')
+        .addSource('angularity-todo-es5')
         .addInvocation('webstorm', FLAGS.map(composeOption(false)))
         .forEach(slowIt(expectations))
         .finally(done);

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@`
`112`	`112`	`"jshint-stylish": "^1.0.1",`
`113`	`113`	`"ncp": "~2.0.0",`
`114`	`114`	`"ps-tree": "~0.0.3",`
`115`		`- "angularity-todo-es5-minified": "angularity/angularity-todo-es5#build-minified",`
`116`		`- "angularity-todo-es5-unminified": "angularity/angularity-todo-es5#build-unminified"`
	`115`	`+ "angularity-todo-es5": "angularity/angularity-todo-es5#ci-build"`
`117`	`116`	`}`
`118`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,6 @@ function factory(base) {`
`285`	`285`
`286`	`286`	`// error in copying implies rejected async`
`287`	`287`	`if (error) {`
`288`		`-console.log(JSON.stringify(error));`
`289`	`288`	`deferred.reject(error);`
`290`	`289`	`}`
`291`	`290`	`// run the command`