Merge pull request #6 from teppeis/node-v0.12

Test with Node v0.12
teppeis · Feb 7, 2015 · eac1a54 · eac1a54
2 parents acd40a7 + 286440a
commit eac1a54
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
 - '0.10'
+- '0.12'
 before_script:
 - npm install -g bower
 - bower install

diff --git a/README.md b/README.md
@@ -49,10 +49,12 @@ or load it with [RequireJS](http://requirejs.org/).
 
 This library is tested with [BrowserStack](http://www.browserstack.com/) Open Source Free license. Thanks!
 
-* IE8, IE11
+* IE 8, IE 11
 * Chrome
 * Firefox
-* Safari7, Safari8
+* Safari 8
+* iOS 7 Safari
+* Android 4.4 Browser
 
 ## License
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "htmlspecialchars",
   "main": "index.js",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "authors": [
     "teppeis <teppeis@gmail.com>"
   ],
@@ -22,7 +22,7 @@
     "node_modules",
     "bower_components",
     "test",
-    "karma.conf.js",
+    "karma.*",
     "package.json"
   ],
   "devDependencies": {

diff --git a/karma.browserstack.conf.js b/karma.browserstack.conf.js
@@ -83,14 +83,14 @@ module.exports = function(config) {
       bs_chrome_win81: {
         base: 'BrowserStack',
         browser: 'chrome',
-        browser_version: '38',
+        browser_version: '40',
         os: 'Windows',
         os_version: '8.1'
       },
       bs_firefox_win81: {
         base: 'BrowserStack',
         browser: 'firefox',
-        browser_version: '33',
+        browser_version: '35',
         os: 'Windows',
         os_version: '8.1'
       },
@@ -115,9 +115,17 @@ module.exports = function(config) {
         os: 'ios',
         os_version: '7.0'
       },
+      bs_android44: {
+        base: 'BrowserStack',
+        device: 'Samsung Galaxy S5',
+        browser: 'Android Browser',
+        browser_version: null,
+        os: 'android',
+        os_version: '4.4'
+      },
       bs_android5: {
         base: 'BrowserStack',
-        device: 'Google Nexus 5',
+        device: 'Google Nexus 6',
         browser: 'Android Browser',
         browser_version: null,
         os: 'android',
@@ -129,13 +137,16 @@ module.exports = function(config) {
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: [
       'bs_ie11_win81',
+      // 'bs_ie10_win8',
+      // 'bs_ie9_win7',
       'bs_ie8_win7',
       'bs_chrome_win81',
       'bs_firefox_win81',
       'bs_safari8_mac_yosemite',
-      'bs_safari7_mac_mavericks',
-      // 'bs_iphone5s',
+      // 'bs_safari7_mac_mavericks',
+      'bs_iphone5s',
       // 'bs_android5',
+      'bs_android44',
       'PhantomJS'
     ],
 

diff --git a/package.json b/package.json
@@ -1,8 +1,11 @@
 {
   "name": "htmlspecialchars",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Escape special characters to HTML entities in JavaScript",
   "main": "index.js",
+  "files": [
+    "index.js"
+  ],
   "scripts": {
     "test": "npm run mocha && npm run espower && npm run karma:requirejs && npm run karma:browserstack",
     "mocha": "mocha --require intelli-espower-loader test/test.js",
@@ -11,9 +14,6 @@
     "karma:browserstack": "./node_modules/karma/bin/karma start karma.browserstack.conf.js --single-run",
     "espower": "espower test/test.js > test/test.powered.js"
   },
-  "directories": {
-    "test": "test/"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/teppeis/htmlspecialchars"
@@ -22,26 +22,26 @@
     "html",
     "escape"
   ],
-  "author": "teppeis@gmail.com",
+  "author": "Teppei Sato <teppeis@gmail.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/teppeis/htmlspecialchars/issues"
   },
   "homepage": "https://github.com/teppeis/htmlspecialchars",
   "devDependencies": {
     "espower-cli": "^0.2.0",
-    "intelli-espower-loader": "^0.5.0",
-    "karma": "^0.12.25",
-    "karma-browserstack-launcher": "^0.1.1",
-    "karma-chrome-launcher": "^0.1.5",
-    "karma-firefox-launcher": "^0.1.3",
+    "intelli-espower-loader": "^0.6.0",
+    "karma": "^0.12.31",
+    "karma-browserstack-launcher": "^0.1.2",
+    "karma-chrome-launcher": "^0.1.7",
+    "karma-firefox-launcher": "^0.1.4",
     "karma-ie-launcher": "^0.1.5",
-    "karma-mocha": "^0.1.9",
+    "karma-mocha": "^0.1.10",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-requirejs": "^0.2.2",
     "karma-safari-launcher": "^0.1.1",
-    "mocha": "^2.0.1",
-    "power-assert": "^0.10.0",
+    "mocha": "^2.1.0",
+    "power-assert": "^0.10.1",
     "requirejs": "^2.1.15"
   }
 }