added node server tests to wercker, removed trailing whatspaces

ozankasikci · ozankasikci · commit 3892a7344f4b · 2015-06-25T16:26:28.000+03:00
diff --git a/scripts/node-testing/shell-scripts.coffee b/scripts/node-testing/shell-scripts.coffee
@@ -14,10 +14,20 @@ module.exports =
       'sudo /opt/koding/run socialworkertests'"
 
 
+    nodejsServer : (publicIpAddress) ->
+
+      return "ssh -o 'StrictHostKeyChecking no' \
+      -i $KODING_DEPLOYMENT_KEY \
+      ubuntu@#{publicIpAddress} \
+      'sudo /opt/koding/run nodeservertests'"
+
+
   asArray : (publicIpAddress) ->
 
     return [
 
       @get.socialWorker publicIpAddress
 
+      @get.nodejsServer publicIpAddress
+
     ]
diff --git a/servers/testhelper.coffee b/servers/testhelper.coffee
@@ -4,15 +4,15 @@ querystring = require 'querystring'
 
 
 # deep extending one object from another, works only for objects
-_.deepObjectExtend = (target, source) ->
+deepObjectExtend = (target, source) ->
 
   for prop of source
 
     if source.hasOwnProperty(prop)
 
       # recursive call to deep extend
       if target[prop] and typeof source[prop] == 'object'
-        _.deepObjectExtend target[prop], source[prop]
+        deepObjectExtend target[prop], source[prop]
       # overwriting property
       else
         target[prop] = source[prop]
@@ -72,7 +72,7 @@ class RegisterHandlerHelper
   @getPostParams = (opts = {}) ->
 
     defaultPostParams = RegisterHandlerHelper.getDefaultParams()
-    postParams        = _.deepObjectExtend defaultPostParams, opts
+    postParams        = deepObjectExtend defaultPostParams, opts
     # after deep extending object, encodes body param to a query string
     postParams.body   = querystring.stringify postParams.body
 
diff --git a/wercker.yml b/wercker.yml
@@ -159,9 +159,9 @@ build:
         name: check connectivity
         code: scripts/wercker/check-connectivity $(pwd)/INSTANCE_DATA
     - script:
-        name: test social worker
+        name: test nodejs
         code: |
-          echo "testing social worker"
+          echo "testing nodejs (social worker, nodejs web server)"
           scripts/node-testing/run-tests $(pwd)/INSTANCE_DATA
     - script:
         name: testing client started
