test coveralls.io

kissyteam · Aug 27, 2013 · 15966ee · 15966ee
1 parent 9124890
commit 15966ee
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 63 deletions.
diff --git a/package.json b/package.json
@@ -1,53 +1,55 @@
 {
-    "name": "kissy",
-    "version": "1.4.0-1",
-    "description": "KISSY",
-    "author": "yiminghe <yiminghe@gmail.com>",
-    "homepage": "http://docs.kissyui.com",
-    "bugs": {
-        "url": "https://github.com/kissyteam/kissy/issues"
-    },
-    "contributors": [
-        "Jayli <lijing00333@163.com>",
-        "dxq613 <dxq613@gmail.com>",
-        "fool2fish <fool2fish@gmail.com>",
-        "kingfo <oicuicu@gmail.com>",
-        "lifesinger <lifesinger@gmail.com>",
-        "lizzie <shengyan1985@gmail.com>",
-        "satans17 <satans17@gmail.com>",
-        "yyfrankyy <yyfrankyy@gmail.com>"
-    ],
-    "engines": {
-        "node": ">=0.8.0"
-    },
-    "bin": {
-        "kissy-xtemplate": "./bin/xtemplate.js",
-        "kissy-kison": "./bin/kison.js"
-    },
-    "directories": {
-        "lib": "./build/"
-    },
-    "main": "./build/kissy-nodejs.js",
-    "scripts": {
-        "test": "node ./tools/test/jasmine-node",
-        "start": "node ./tools/test/server"
-    },
-    "optionalDependencies": {
-        "optimist": ">=0.3.4",
-        "jsdom": ">=0.2.0",
-        "js-beautify": ">=0.2.0"
-    },
-    "devDependencies": {
-        "express": ">3.0"
-    },
-    "licenses": [
-        {
-            "type": "MIT",
-            "url": "https://github.com/kissyteam/kissy/blob/master/LICENSE.md"
-        }
-    ],
-    "repository": {
-        "type": "git",
-        "url": "http://github.com/kissyteam/kissy.git"
+  "name": "kissy",
+  "version": "1.4.0-1",
+  "description": "KISSY",
+  "author": "yiminghe <yiminghe@gmail.com>",
+  "homepage": "http://docs.kissyui.com",
+  "bugs": {
+    "url": "https://github.com/kissyteam/kissy/issues"
+  },
+  "contributors": [
+    "Jayli <lijing00333@163.com>",
+    "dxq613 <dxq613@gmail.com>",
+    "fool2fish <fool2fish@gmail.com>",
+    "kingfo <oicuicu@gmail.com>",
+    "lifesinger <lifesinger@gmail.com>",
+    "lizzie <shengyan1985@gmail.com>",
+    "satans17 <satans17@gmail.com>",
+    "yyfrankyy <yyfrankyy@gmail.com>"
+  ],
+  "engines": {
+    "node": ">=0.8.0"
+  },
+  "bin": {
+    "kissy-xtemplate": "./bin/xtemplate.js",
+    "kissy-kison": "./bin/kison.js"
+  },
+  "directories": {
+    "lib": "./build/"
+  },
+  "main": "./build/kissy-nodejs.js",
+  "scripts": {
+    "test": "node ./tools/test/jasmine-node",
+    "start": "node ./tools/test/server"
+  },
+  "optionalDependencies": {
+    "optimist": ">=0.3.4",
+    "jsdom": ">=0.2.0",
+    "js-beautify": ">=0.2.0"
+  },
+  "devDependencies": {
+    "express": ">3.0",
+    "mkdirp": "~0.3.5",
+    "request": "~2.27.0"
+  },
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://github.com/kissyteam/kissy/blob/master/LICENSE.md"
     }
-}
+  ],
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/kissyteam/kissy.git"
+  }
+}
diff --git a/tools/test/gen-tc.js b/tools/test/gen-tc.js
@@ -30,7 +30,7 @@ function collectTc(baseDir, codes) {
 
 var codes = [];
 collectTc(srcDir, codes);
-
+codes.push("tests.push('/kissy/src/color/tests/runner/test.jss?coverage');\n");
 var finalCode = '/**\n' +
     'gen by gen-tc.js\n' +
     '*/\n' +

diff --git a/tools/test/jasmine-phantomjs.js b/tools/test/jasmine-phantomjs.js
@@ -54,7 +54,7 @@ function next(url) {
     });
 }
 var t = '';
-// t = '/kissy/src/dom/tests/runner/test.jss';
+// t = '/kissy/src/color/tests/runner/test.jss?coverage';
 // t='/src/seed/tests/specs/package-raw/test-combo.html';
 // t='/kissy/src/dd/sub-modules/constrain/tests/runner/test.html';
 next(t);
diff --git a/tools/test/server.js b/tools/test/server.js
@@ -7,22 +7,24 @@
 require('./gen-tc');
 require('../gen-package/gen-package');
 
+var mkdirp = require('mkdirp');
 var path = require('path');
 var fs = require('fs');
 fs.exists = fs.exists || path.exists;
 fs.existsSync = fs.existsSync || path.existsSync;
 var cwd = process.cwd();
 var currentDir = __dirname;
 var S = global.KISSY = global.S = require(cwd + '/build/kissy-nodejs.js');
+var request = require('request');
 
 S.use('xtemplate/nodejs', function (S, XTemplateNodeJs) {
     function startServer(port) {
 
         var express = require('express');
         var app = express();
-        S.config('packages',{
-            'xtemplates':{
-                base:currentDir
+        S.config('packages', {
+            'xtemplates': {
+                base: currentDir
             }
         });
         var tplCache = {};
@@ -35,7 +37,7 @@ S.use('xtemplate/nodejs', function (S, XTemplateNodeJs) {
             if (tplCache[name]) {
                 return tplCache[name];
             }
-            return tplCache[name] =XTemplateNodeJs.loadFromModuleName('xtemplates/'+name);
+            return tplCache[name] = XTemplateNodeJs.loadFromModuleName('xtemplates/' + name);
         }
 
         var utils = {
@@ -138,9 +140,36 @@ S.use('xtemplate/nodejs', function (S, XTemplateNodeJs) {
             }));
         });
 
-        app.listen(port);
-
+        app.post('/save-coverage-report', function (req, res) {
+            var service_job_id = process.env.TRAVIS_JOB_ID;
+            if (!service_job_id) {
+                return;
+            }
+            var report = req.param('report');
+            var myPath = cwd + '/../' + req.param('path');
+            var jsonReport = JSON.parse(report);
+            var srcPath = path.resolve(myPath, '../../../src/') + '/';
+            var source_files = [];
+            var postData = {
+                service_name: 'travis-ci',
+                service_job_id: service_job_id,
+                source_files: source_files
+            };
+            for (var f in jsonReport) {
+                var detail = jsonReport[f];
+                var source = fs.readFileSync(srcPath + f, 'utf8');
+                source_files.push({
+                    name: f,
+                    source: source,
+                    coverage: detail.lineData
+                });
+            }
+            var str = JSON.stringify(postData);
+            var url = 'https://coveralls.io/api/v1/jobs';
+            request.post({url: url, form: { json: str}});
+        });
 
+        app.listen(port);
     }
 
     startServer(9999);

diff --git a/tools/test/tc.js b/tools/test/tc.js
@@ -190,5 +190,7 @@ tests.push('/kissy/src/xtemplate/tests/runner/test.jss');
 
 tests.push('/kissy/src/xtemplate/tests/runner/test.jss?build');
 
+tests.push('/kissy/src/color/tests/runner/test.jss?coverage');
+
  return tests; 
   };
diff --git a/tools/test/xtemplates/runner.html b/tools/test/xtemplates/runner.html
@@ -34,9 +34,9 @@
 <h1 style="text-align: center">{{component}} test cases</h1>
 {{{html}}}
 <script>
-    var tests=['specs/'];
+    var tests=['specs/'], S=KISSY;
 
-    KISSY.config('packages',{
+    S.config('packages',{
         specs:{
             base:'../'
         },
@@ -55,11 +55,35 @@ <h1 style="text-align: center">{{component}} test cases</h1>
 
     {{{script}}}
 
-    KISSY.use(tests, function (S) {
+    S.use(tests, function (S) {
         jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
         jasmine.getEnv().addReporter(new jasmine.ConsoleReporter());
         jasmine.getEnv().execute(function () {
-            jasmine.kissyNext(this.results().failedCount);
+            var self=this;
+            function createRequest(){
+                if (window.ActiveXObject) {
+                    return new ActiveXObject("Microsoft.XMLHTTP");
+                }
+                else {
+                    return new XMLHttpRequest();
+                }
+            }
+            if(window.jscoverage_serializeCoverageToJSON){
+                var json = window.jscoverage_serializeCoverageToJSON();
+
+                var request = createRequest();
+                request.open('post', '/save-coverage-report', true);
+                request.setRequestHeader('content-type','application/x-www-form-urlencoded; charset=UTF-8');
+                request.onreadystatechange = function () {
+                    if (request.readyState === 4 && request.status == 200) {
+                        jasmine.kissyNext(self.results().failedCount);
+                    }
+                };
+                request.send(S.param({
+                    report:json,
+                    path:location.pathname
+                }));
+            }
         });
     });
 </script>