Skip to content

Commit

Permalink
Run Unit tests with grunt tasks.
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwebfor
wwebfor committed Oct 31, 2014
1 parent b700e5a commit 53cd975
Show file tree
Hide file tree
Showing 42 changed files with 314 additions and 9,714 deletions.
22 changes: 11 additions & 11 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,15 @@ module.exports = function (grunt) {
test: {
options: {
port: 9001,
middleware: function (connect) {
return [
lrSnippet,
mountFolder(connect, '.tmp'),
mountFolder(connect, 'test'),
mountFolder(connect, yeomanConfig.app)
];
}
base: '.',
// middleware: function (connect) {
// return [
// lrSnippet,
// mountFolder(connect, '.tmp'),
// mountFolder(connect, 'test'),
// mountFolder(connect, yeomanConfig.app)
// ];
// }
}
},
dist: {
Expand Down Expand Up @@ -159,12 +160,11 @@ module.exports = function (grunt) {
mocha: {
all: {
options: {
run: true,
urls: ['http://localhost:<%= connect.test.options.port %>/index.html']
run: false,
urls: ['http://localhost:<%= connect.test.options.port %>/test/index.html']
}
}
},
// Compile less files
less: {
options: {
paths: [
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ define([
});

if (App.getCurrentRoute() === '') {
App.trigger('notes:list');
App.vent.trigger('notes:list');
}
});
});
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/apps/notes/appNote.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ define([
/**
* Router events
*/
App.on('notes:list', function () {
App.vent.on('notes:list', function () {
App.navigate(URI.link('/notes'), { trigger : true });
});

Expand Down
1 change: 0 additions & 1 deletion app/scripts/hello.coffee
View file

This file was deleted.

41 changes: 41 additions & 0 deletions app/scripts/init.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* global define, requirejs, Modernizr */
define([
'jquery',
'app',
'bootstrap'
], function($, App) {
'use strict';

function startApp() {
var request;

// Browser doesn't support neither indexeddb nor websql
if ( ( !Modernizr.indexeddb && !Modernizr.websqldatabase ) ||
!Modernizr.localstorage ) {
window.alert('Your browser is outdated and does not support IndexedDB and/or LocalStorage.');
return;
}

request = window.indexedDB.open('MyTestDatabase');
request.onerror = function() {
window.appNoDB = true;
App.start();
};
request.onsuccess = function() {
App.start();
};
}

$(document).ready(function() {
if ( !Modernizr.indexeddb ) {
requirejs(['IndexedDBShim'], function() {
window.appNoDB = true;
window.shimIndexedDB.__useShim(true);
startApp();
});
}
else {
startApp();
}
});
});
199 changes: 88 additions & 111 deletions app/scripts/main.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
require.config({
/* global requirejs */
requirejs.config({

// Find all nested dependencies
findNestedDependencies: true,
waitSeconds: 10,

packages: [
// Ace editor
{
Expand All @@ -20,64 +26,75 @@ require.config({
}
],
paths: {
sjcl : '../bower_components/sjcl/sjcl',
// Dependencies : and libraries
text : '../bower_components/requirejs-text/text',
jquery : '../bower_components/jquery/dist/jquery',
underscore : '../bower_components/underscore/underscore',
devicejs : '../bower_components/device.js/lib/device.min',
i18next : '../bower_components/i18next/i18next.amd.withJQuery.min',
// Backbone & : Marionette
backbone : '../bower_components/backbone/backbone',
marionette : '../bower_components/marionette/lib/core/backbone.marionette',
localStorage : '../bower_components/backbone.localStorage/backbone.localStorage',
IndexedDBShim : '../bower_components/IndexedDBShim/dist/IndexedDBShim',
indexedDB : '../bower_components/indexeddb-backbonejs-adapter/backbone-indexeddb',
dropzone : '../bower_components/dropzone/downloads/dropzone.min',
toBlob : '../bower_components/blueimp-canvas-to-blob/js/canvas-to-blob',
blobjs : '../bower_components/Blob/Blob',
fileSaver : '../bower_components/FileSaver/FileSaver',
enquire : '../bower_components/enquire/dist/enquire.min',
dropbox : 'libs/dropbox',
hammerjs : '../bower_components/hammerjs/hammer',
remotestorage : '../bower_components/remotestorage.js/release/0.10.0-beta3/remotestorage-nocache.amd',
'backbone.wreqr' : '../bower_components/backbone.wreqr/lib/backbone.wreqr',
'backbone.babysitter' : '../bower_components/backbone.babysitter/lib/backbone.babysitter',
// Keybindings :
'Mousetrap' : '../bower_components/mousetrap/mousetrap',
'mousetrap-pause' : '../bower_components/mousetrap/plugins/pause/mousetrap-pause',
'backbone.mousetrap' : '../bower_components/backbone.mousetrap/backbone.mousetrap',
// Pagedown :
'pagedown' : '../bower_components/pagedown/Markdown.Editor',
'pagedown-extra' : '../bower_components/pagedown-extra/Markdown.Extra',
'to-markdown' : '../bower_components/to-markdown/src/to-markdown',
'mathjax' : '../bower_components/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML',
// Markdown helpers :
'checklist' : 'libs/checklist',
'tags' : 'libs/tags',
// Other : libraries
'bootstrap' : '../bower_components/bootstrap/dist/js/bootstrap.min',
'prettify' : '../bower_components/google-code-prettify/src/prettify',
// View : scripts here
'modalRegion' : 'views/modal',
'brandRegion' : 'views/brand',
'apps' : 'apps/',
'locales' : '../locales'
sjcl : '../bower_components/sjcl/sjcl',
text : '../bower_components/requirejs-text/text',
jquery : '../bower_components/jquery/dist/jquery',
bootstrap : '../bower_components/bootstrap/dist/js/bootstrap.min',
i18next : '../bower_components/i18next/i18next.amd.withJQuery.min',

// Backbone
underscore : '../bower_components/underscore/underscore',
backbone : '../bower_components/backbone/backbone',
marionette : '../bower_components/marionette/lib/core/backbone.marionette',
'backbone.wreqr' : '../bower_components/backbone.wreqr/lib/backbone.wreqr',
'backbone.babysitter' : '../bower_components/backbone.babysitter/lib/backbone.babysitter',
'backbone.mousetrap' : '../bower_components/backbone.mousetrap/backbone.mousetrap',

// Mousetrap
'Mousetrap' : '../bower_components/mousetrap/mousetrap',
'mousetrap-pause' : '../bower_components/mousetrap/plugins/pause/mousetrap-pause',

// Storage adapters
localStorage : '../bower_components/backbone.localStorage/backbone.localStorage',
indexedDB : '../bower_components/indexeddb-backbonejs-adapter/backbone-indexeddb',
IndexedDBShim : '../bower_components/IndexedDBShim/dist/IndexedDBShim',
remotestorage : '../bower_components/remotestorage.js/release/0.10.0-beta3/remotestorage-nocache.amd',
dropbox : 'libs/dropbox',

// Markdown
'pagedown' : '../bower_components/pagedown/Markdown.Editor',
'pagedown-extra' : '../bower_components/pagedown-extra/Markdown.Extra',
'to-markdown' : '../bower_components/to-markdown/src/to-markdown',

// Others
mathjax : '../bower_components/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML',
prettify : '../bower_components/google-code-prettify/src/prettify',
dropzone : '../bower_components/dropzone/downloads/dropzone.min',
toBlob : '../bower_components/blueimp-canvas-to-blob/js/canvas-to-blob',
blobjs : '../bower_components/Blob/Blob',
fileSaver : '../bower_components/FileSaver/FileSaver',
enquire : '../bower_components/enquire/dist/enquire.min',
hammerjs : '../bower_components/hammerjs/hammer',
devicejs : '../bower_components/device.js/lib/device.min',

// Aliases
'modalRegion' : 'views/modal',
'brandRegion' : 'views/brand',
'checklist' : 'libs/checklist',
'tags' : 'libs/tags',
'apps' : 'apps',
'locales' : '../locales'
},
shim: {
prettify: {
exports: 'PR'
},
// Backbone
underscore: {
exports: '_'
},
backbone: {
deps: ['underscore', 'jquery'],
exports: 'Backbone'
},
devicejs: {
exports: 'device'
'backbone.mousetrap': {
deps: ['Mousetrap', 'mousetrap-pause', 'backbone']
},

// Mousetrap
'Mousetrap': { },
'mousetrap-pause': {
deps: ['Mousetrap']
},

// Storage adapters
localStorage: {
deps: ['underscore', 'backbone']
},
Expand All @@ -87,15 +104,14 @@ require.config({
'IndexedDBShim': {
exports: 'shimIndexedDB'
},
// Mousetrap
'Mousetrap': { },
'mousetrap-pause': {
deps: ['Mousetrap']
dropbox: {
exports: 'Dropbox'
},
'backbone.mousetrap': {
deps: ['Mousetrap', 'mousetrap-pause', 'backbone']
remotestorage: {
exports: 'remoteStorage'
},
// Ace && pagedown editor

// Markdown
ace: {
exports: 'ace'
},
Expand All @@ -111,9 +127,10 @@ require.config({
'pagedown-ace/Markdown.Sanitizer': {
deps: [ 'pagedown-ace/Markdown.Converter' ]
},
'mathjax': {
exports: 'MathJax'
'to-markdown': {
exports: 'toMarkdown'
},

// Xregexp
'xregexp/xregexp': {
exports: 'XRegExp'
Expand All @@ -122,65 +139,25 @@ require.config({
deps: ['xregexp/xregexp'],
exports: 'XRegExp'
},
'to-markdown': {
exports: 'toMarkdown'

// Others
sjcl: {
exports: 'sjcl'
},
bootstrap: {
deps: ['jquery']
},
sjcl: {
exports: 'sjcl'
'mathjax': {
exports: 'MathJax'
},
dropbox: {
exports: 'Dropbox'
devicejs: {
exports: 'device'
},
remotestorage: {
exports: 'remoteStorage'
}
},
findNestedDependencies: true,
waitSeconds: 10
});

require([
'jquery',
'app',
'bootstrap'
], function ($, App) {
'use strict';
/* global Modernizr */

function startApp () {
var request;

// Browser doesn't support neither indexeddb nor websql
if ( ( !Modernizr.indexeddb && !Modernizr.websqldatabase ) ||
!Modernizr.localstorage ) {
window.alert('Your browser is outdated and does not support IndexedDB and/or LocalStorage.');
return;
prettify: {
exports: 'PR'
}

request = window.indexedDB.open('MyTestDatabase');
request.onerror = function() {
window.appNoDB = true;
App.start();
};
request.onsuccess = function() {
App.start();
};
}

$(document).ready(function () {
if ( !Modernizr.indexeddb ) {
require(['IndexedDBShim'], function () {
window.appNoDB = true;
window.shimIndexedDB.__useShim(true);
startApp();
});
}
else {
startApp();
}
});

});

// Starting point
requirejs(['init']);
3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@
},
"engines": {
"node": ">=0.8.0"
}
},
"optionalDependencies": {}
}
13 changes: 9 additions & 4 deletions test/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mocha Spec Runner</title>
<link rel="stylesheet" href="bower_components/mocha/mocha.css">
</head>
<body>
<div id="mocha"></div>

<script src="bower_components/mocha/mocha.js"></script>
<script>mocha.setup('bdd')</script>
<script src="bower_components/chai/chai.js"></script>

<script>
mocha.setup('bdd');
mocha.reporter('html');
var expect = chai.expect,
should = chai.should(),
assert = chai.assert;
</script>
<script data-main="spec/test" src="../app/bower_components/requirejs/require.js"></script>

</body>
</html>
Loading

0 comments on commit 53cd975

Please sign in to comment.