Skip to content

Commit

Permalink
Tests improvments
Browse files Browse the repository at this point in the history
CSS tests added
JSHint tests added
Libs removed
Components removed
Sources fixes
  • Loading branch information
larchanka committed Nov 13, 2013
1 parent de1bfea commit 1a9e649
Show file tree
Hide file tree
Showing 44 changed files with 1,567 additions and 4,458 deletions.
41 changes: 41 additions & 0 deletions .jshintrc
@@ -0,0 +1,41 @@
{
"globals": {
"jasmine": false,
"spyOn": false,
"it": false,
"console": false,
"describe": false,
"expect": false,
"beforeEach": false,
"waits": false,
"waitsFor": false,
"runs": false
},

"node" : true,
"es5" : false,
"expr" : false,
"browser" : true,
"boss" : false,
"curly": false,
"debug": true,
"devel": true,
"eqeqeq": false,
"evil": true,
"forin": false,
"immed": true,
"laxbreak": false,
"newcap": false,
"noarg": true,
"noempty": false,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": false,
"sub": true,
"strict": false,
"white": false,
"unused": false
}
5 changes: 5 additions & 0 deletions .travis.yml
Expand Up @@ -2,9 +2,14 @@ language: node_js
node_js:
- 0.10
- 0.8

before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "echo 'Installing Slimer'"
- "wget http://download.slimerjs.org/v0.8/slimerjs-0.8.3.zip"
- "unzip slimerjs-0.8.3.zip"
- "mv slimerjs-0.8.3 ./slimerjs"
- npm install nws -g
- nws -p 9292 &
- sleep 5
Expand Down
72 changes: 50 additions & 22 deletions Gruntfile.js
@@ -1,29 +1,27 @@
var fs = require('fs');

module.exports = (function (grunt) {
module.exports = function (grunt) {

grunt.registerTask('build', "X-Framework build", function () {
console.log('Adding core elements');
var jsSources = [
'xf/src/xf.jquery.hooks.js',
'xf/src/xf.core.js',
'xf/src/xf.app.js',
'xf/src/xf.touch.js',
'xf/src/xf.router.js',
'xf/src/xf.utils.js',
'xf/src/xf.pages.js',
'xf/src/xf.ui.js',
'xf/src/xf.settings.js',
'xf/src/xf.storage.js',
'xf/src/xf.device.js',
'xf/src/xf.collection.js',
'xf/src/xf.model.js',
'xf/src/xf.view.js',
'xf/src/xf.component.js'
'xf/src/xf.jquery.hooks.js',
'xf/src/xf.core.js',
'xf/src/xf.app.js',
'xf/src/xf.touch.js',
'xf/src/xf.router.js',
'xf/src/xf.utils.js',
'xf/src/xf.pages.js',
'xf/src/xf.ui.js',
'xf/src/xf.settings.js',
'xf/src/xf.storage.js',
'xf/src/xf.device.js',
'xf/src/xf.collection.js',
'xf/src/xf.model.js',
'xf/src/xf.view.js',
'xf/src/xf.component.js'
];

// Run through files and detect icons to use
var lessSources = [];
//var lessSources = [];

// License text

Expand Down Expand Up @@ -93,16 +91,46 @@ module.exports = (function (grunt) {
});

grunt.registerTask('test', "X-Framework qunit test", function () {
console.log('Starting qunit tests');
grunt.initConfig({
jshint: {
options: {
jshintrc: '.jshintrc'
},
files: [
'Gruntfile.js',
'package.json',
'xf/src/*.js',
'xf/ui/*.js',
'js/xf.js',
'test/components/test.js',
'test/src/*.js',
'test/ui/*.js',
'test/lib/run-qunit.js',
'test/*.js'
]
},
recess: {
options: {
compile: false,
noUniversalSelectors: false,
strictPropertyOrder: false,
noOverqualifying: false,
zeroUnits: false
},
files:[
'styles/*.css'
]
},
qunit: {
files: ['test/index.html']
}
});
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.task.run(['qunit']);
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-recess');
grunt.task.run(['jshint', 'qunit', 'recess']);
});

grunt.registerTask('default', ['build']);

});
};
31 changes: 0 additions & 31 deletions js/components/comments.js

This file was deleted.

27 changes: 0 additions & 27 deletions js/components/favourites.js

This file was deleted.

19 changes: 0 additions & 19 deletions js/components/feedback.js

This file was deleted.

36 changes: 0 additions & 36 deletions js/components/home.js

This file was deleted.

31 changes: 0 additions & 31 deletions js/components/presentation.js

This file was deleted.

19 changes: 0 additions & 19 deletions js/components/speaker.js

This file was deleted.

19 changes: 0 additions & 19 deletions js/components/speakers.js

This file was deleted.

0 comments on commit 1a9e649

Please sign in to comment.