unit tests

opencomponents · Jan 13, 2017 · 843b471 · 843b471
1 parent f5cb1eb
commit 843b471
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 266 deletions.
diff --git a/src/cli/domain/package-server-script/bundle/config/externalDependenciesHandlers.js b/src/cli/domain/package-server-script/bundle/config/externalDependenciesHandlers.js
@@ -20,7 +20,7 @@ module.exports = function externalDependenciesHandlers(dependencies){
 
   return [
     function(context, req, callback) {
-      if (/^[a-z@][a-z\-\/0-9]+$/.test(req)) {
+      if (/^[a-z@][a-z\-\/0-9]+$/i.test(req)) {
         var dependencyName = req;
         if (/\//g.test(dependencyName)) {
           dependencyName = dependencyName.substring(0, dependencyName.indexOf('/'));
@@ -31,7 +31,7 @@ module.exports = function externalDependenciesHandlers(dependencies){
       }
       callback();
     },
-    /^[a-z@][a-z\-\/0-9]+$/
+    /^[a-z@][a-z\-\/0-9]+$/i
   ];
 };
 

diff --git a/src/cli/domain/package-server-script/bundle/config/wrapLoops.js b/src/cli/domain/package-server-script/bundle/config/wrapLoops.js
@@ -8,7 +8,7 @@ module.exports = function wrapLoops(node){
 
   if(loopKeywords.indexOf(node.type) > -1){
     node.update(
-      'var __ITER = ' + CONST_MAX_ITERATIONS + ';\n'
+      'var __ITER = ' + CONST_MAX_ITERATIONS + ';'
       + node.source()
     );
   }

diff --git a/test/integration/cli-domain-package-server-script/cli-domain-package-server-script.js b/test/integration/cli-domain-package-server-script/cli-domain-package-server-script.js
@@ -43,27 +43,32 @@ describe('cli : domain : package-server-script', function(){
       });
 
       it('should throw an error with error details', function(done){
-        packageServerScript(
-          {
-            componentPath: componentPath,
-            ocOptions: {
-              files: {
-                data: serverName
-              }
+        try {
+          packageServerScript(
+            {
+              componentPath: componentPath,
+              ocOptions: {
+                files: {
+                  data: serverName
+                }
+              },
+              publishPath: publishPath,
+              webpack: webpackOptions
             },
-            publishPath: publishPath,
-            webpack: webpackOptions
-          },
-          function(err, res){
-            try {
-              expect(err.toString()).to.contain.contain('Unexpected token, expected , (3:19)');
-              return done();
-            } catch(e) {
-              return done(e);
+            function(err, res){
+              try {
+                expect(err.toString()).to.contain.contain('Unexpected token, expected , (3:19)');
+                return done();
+              } catch(e) {
+                return done(e);
+              }
+              return done('error');
             }
-            return done('error');
-          }
-        );
+          );
+        } catch (e) {
+          expect(e).to.contain.contain('Unexpected token, expected , (3:19)');
+          done();
+        }
       });
     });