Skip to content

Commit

Permalink
Merge pull request #35 from bboyle/jquery3
Browse files Browse the repository at this point in the history
add tests for jquery v3
  • Loading branch information
bboyle authored Jun 28, 2016
2 parents 8ec8645 + ae6ab27 commit 7e3137f
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
sudo: false
language: node_js
node_js:
- "4.3.0"
- "4"
before_install:
- if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
before_script:
- npm install -g grunt-cli
- npm install -g bower
Expand Down
8 changes: 7 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function( grunt ) {
'<%= grunt.template.today("yyyy-mm-dd") %>\n' +
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
' Licensed <%= _.map(pkg.licenses, "type").join(", ") %> */\n',

browsers: [
{ browserName: 'Internet Explorer', version: '11' },
Expand Down Expand Up @@ -83,6 +83,12 @@ module.exports = function( grunt ) {
'http://127.0.0.1:8000/test/plugin.html?jquery=2.1.0',
'http://127.0.0.1:8000/test/relevantWhen.html?jquery=2.1.0',
'http://127.0.0.1:8000/test/ui.html?jquery=2.1.0',
// 3.0.0
'http://127.0.0.1:8000/test/events.html?jquery=3.0.0',
'http://127.0.0.1:8000/test/instructions.html?jquery=3.0.0',
'http://127.0.0.1:8000/test/plugin.html?jquery=3.0.0',
'http://127.0.0.1:8000/test/relevantWhen.html?jquery=3.0.0',
'http://127.0.0.1:8000/test/ui.html?jquery=3.0.0',
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "relevance",
"description": "Progressive disclosure (relevance) for HTML elements",
"version": "2.1.1",
"version": "2.1.2",
"homepage": "https://github.com/bboyle/relevance",
"authors": [
"Ben Boyle <benjamins.boyle@gmail.com>"
Expand Down
2 changes: 1 addition & 1 deletion dist/relevance.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! relevance - v2.1.1 - 2016-02-15
/*! relevance - v2.1.2 - 2016-06-28
* https://github.com/bboyle/relevance
* Copyright (c) 2016 Ben Boyle; Licensed MIT */
(function( $ ) {
Expand Down
4 changes: 2 additions & 2 deletions dist/relevance.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 12 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@
"name": "relevance",
"title": "relevance",
"description": "Progressive disclosure (relevance) for HTML elements",
"version": "2.1.1",
"version": "2.1.2",
"homepage": "https://github.com/bboyle/relevance",
"author": {
"name": "Ben Boyle",
"email": "benjamins.boyle@gmail.com",
"url": "http://ultimate.benboyle.id.au/"
},
"engines": {
"node": ">=4.0.0",
"npm": ">=3.0.0"
},
"repository": {
"type": "git",
"url": "git://github.com/bboyle/relevance.git"
Expand All @@ -33,14 +37,14 @@
"test": "test"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-clean": "^0.7.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-connect": "^0.11.2",
"grunt-contrib-jshint": "^0.12.0",
"grunt": "^1.0.1",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-qunit": "^1.0.1",
"grunt-contrib-uglify": "^0.11.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-contrib-uglify": "^1.0.1",
"grunt-contrib-watch": "^1.0.0",
"grunt-saucelabs": "^8.6.2",
"qunitjs": "^1.21.0"
},
Expand Down

0 comments on commit 7e3137f

Please sign in to comment.