cover the unminified option for the test.spec.js. Share the expectations between describes.

Author: impaler

test/specs/tasks/test.spec.js

@@ -52,40 +52,34 @@ describe('The Angularity test task', function () {
       .addInvocation('test')
       .forEach(slowIt(expectations))
       .finally(done);
-
-    function expectations(testCase) {
-      expect(testCase.stdout).toBeTask('test');
-      expect(testCase.stdout).toMatch(/INFO\s\[karma\]/);  // TODO @bholloway choose a browser that will work on cloud CI
-      javascriptTask.expectations(testCase);
-
-      // make replacements to allow karma.conf.js to be correctly diff'd
-      var workingTestFile = helper.getConcatenation(testCase.cwd, TEST_FOLDER);
-      var sourceTestFile  = helper.getConcatenation(testCase.sourceDir, TEST_FOLDER);
-      var replace         = helper.replacer()
-        .add(/^(\s*basePath\:\s*['"])[^'"]*(['"].*)$/gm, '$1%redacted%$2')  // basePath should be redacted
-        .add(/^(\s*require\(['"])[^'"]*(['"].*)$/gm,     '$1%redacted%$2')  // all require paths should be redacted
-        .add(/\\{2}/g, '/')
-        .commit();
-      expect(replace(workingTestFile('karma.conf.js'))).diffPatch(replace(sourceTestFile('karma.conf.js')));
-    }
   });
 
-  describe('should not support unminified option', function(done) {
+  describe('should support unminified option, but not minify test output', function(done) {
     helper.runner.create()
       .addSource('minimal-es5-unminified')
       .addInvocation('test --unminified')
       .addInvocation('test -u')
       .forEach(slowIt(expectations))
       .finally(done);
-
-    function expectations(testCase) {
-      if (!testCase.exitcode) {  // TODO @bholloway windows invocation fails in test but not in real use
-        expect(testCase.stderr).toBeHelpWithError(true);
-      }
-    }
   });
 });
 
+function expectations(testCase) {
+  expect(testCase.stdout).toBeTask('test');
+  expect(testCase.stdout).toMatch(/INFO\s\[karma\]/);  // TODO @bholloway choose a browser that will work on cloud CI
+  javascriptTask.expectations(testCase);
+
+  // make replacements to allow karma.conf.js to be correctly diff'd
+  var workingTestFile = helper.getConcatenation(testCase.cwd, TEST_FOLDER);
+  var sourceTestFile  = helper.getConcatenation(testCase.sourceDir, TEST_FOLDER);
+  var replace         = helper.replacer()
+    .add(/^(\s*basePath\:\s*['"])[^'"]*(['"].*)$/gm, '$1%redacted%$2')  // basePath should be redacted
+    .add(/^(\s*require\(['"])[^'"]*(['"].*)$/gm,     '$1%redacted%$2')  // all require paths should be redacted
+    .add(/\\{2}/g, '/')
+    .commit();
+  expect(replace(workingTestFile('karma.conf.js'))).diffPatch(replace(sourceTestFile('karma.conf.js')));
+}
+
 function customMatchers() {
   jasmine.addMatchers({
     toBeHelpWithError: matchers.getHelpMatcher(/^\s*The "test" task/)