mirror of
https://github.com/moparisthebest/mail
synced 2024-11-22 17:02:17 -05:00
Fix paths to unit
This commit is contained in:
parent
1e8894abe6
commit
4880c162f8
16
Gruntfile.js
16
Gruntfile.js
@ -44,29 +44,17 @@ module.exports = function(grunt) {
|
|||||||
},
|
},
|
||||||
|
|
||||||
jshint: {
|
jshint: {
|
||||||
all: ['Gruntfile.js', 'src/*.js', 'src/js/**/*.js', 'test/new-unit/*.js', 'test/unit/*.js', 'test/integration/*.js'],
|
all: ['Gruntfile.js', 'src/*.js', 'src/js/**/*.js', 'test/unit/*.js', 'test/integration/*.js'],
|
||||||
options: {
|
options: {
|
||||||
jshintrc: '.jshintrc'
|
jshintrc: '.jshintrc'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
qunit: {
|
|
||||||
all: {
|
|
||||||
options: {
|
|
||||||
timeout: 20000,
|
|
||||||
urls: ['http://localhost:<%= connect.test.options.port %>/test/unit/index.html'
|
|
||||||
/*,
|
|
||||||
'http://localhost:<%= connect.test.options.port %>/test/integration/index.html'*/
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
mocha: {
|
mocha: {
|
||||||
all: {
|
all: {
|
||||||
options: {
|
options: {
|
||||||
urls: [
|
urls: [
|
||||||
'http://localhost:<%= connect.test.options.port %>/test/new-unit/index.html',
|
'http://localhost:<%= connect.test.options.port %>/test/unit/index.html',
|
||||||
'http://localhost:<%= connect.test.options.port %>/test/integration/index.html'
|
'http://localhost:<%= connect.test.options.port %>/test/integration/index.html'
|
||||||
],
|
],
|
||||||
run: false,
|
run: false,
|
||||||
|
@ -40,7 +40,7 @@ For development you can start a connect dev server:
|
|||||||
|
|
||||||
grunt dev
|
grunt dev
|
||||||
|
|
||||||
Then visit [http://localhost:8580/dist/chrome.html#/desktop](http://localhost:8580/dist/chrome.html#/desktop) for front-end code or [http://localhost:8580/test/new-unit/](http://localhost:8580/test/new-unit/) to test JavaScript changes. You can also start a watch task so you don't have rebuild everytime you make a change:
|
Then visit [http://localhost:8580/dist/chrome.html#/desktop](http://localhost:8580/dist/chrome.html#/desktop) for front-end code or [http://localhost:8580/test/unit/](http://localhost:8580/test/unit/) to test JavaScript changes. You can also start a watch task so you don't have rebuild everytime you make a change:
|
||||||
|
|
||||||
grunt watch
|
grunt watch
|
||||||
|
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
"sinon": "~1.7.3",
|
"sinon": "~1.7.3",
|
||||||
"grunt-contrib-connect": "~0.5.0",
|
"grunt-contrib-connect": "~0.5.0",
|
||||||
"grunt-contrib-jshint": "~0.6.4",
|
"grunt-contrib-jshint": "~0.6.4",
|
||||||
"grunt-contrib-qunit": "~0.2.2",
|
|
||||||
"grunt-mocha": "~0.4.1",
|
"grunt-mocha": "~0.4.1",
|
||||||
"grunt-contrib-clean": "~0.5.0",
|
"grunt-contrib-clean": "~0.5.0",
|
||||||
"grunt-csso": "~0.6.1",
|
"grunt-csso": "~0.6.1",
|
||||||
|
@ -6,9 +6,10 @@ define(function(require) {
|
|||||||
expect = chai.expect;
|
expect = chai.expect;
|
||||||
|
|
||||||
describe('Crypto unit tests', function() {
|
describe('Crypto unit tests', function() {
|
||||||
var crypto;
|
this.timeout(20000);
|
||||||
|
|
||||||
var password = 'password',
|
var crypto,
|
||||||
|
password = 'password',
|
||||||
keySize = 128,
|
keySize = 128,
|
||||||
ivSize = 128;
|
ivSize = 128;
|
||||||
|
|
||||||
|
@ -28,33 +28,33 @@ function startTests() {
|
|||||||
|
|
||||||
require(
|
require(
|
||||||
[
|
[
|
||||||
'test/new-unit/oauth-test',
|
'test/unit/oauth-test',
|
||||||
'test/new-unit/auth-test',
|
'test/unit/auth-test',
|
||||||
'test/new-unit/email-dao-test',
|
'test/unit/email-dao-test',
|
||||||
'test/new-unit/app-controller-test',
|
'test/unit/app-controller-test',
|
||||||
'test/new-unit/pgp-test',
|
'test/unit/pgp-test',
|
||||||
'test/new-unit/crypto-test',
|
'test/unit/crypto-test',
|
||||||
'test/new-unit/rest-dao-test',
|
'test/unit/rest-dao-test',
|
||||||
'test/new-unit/publickey-dao-test',
|
'test/unit/publickey-dao-test',
|
||||||
'test/new-unit/lawnchair-dao-test',
|
'test/unit/lawnchair-dao-test',
|
||||||
'test/new-unit/keychain-dao-test',
|
'test/unit/keychain-dao-test',
|
||||||
'test/new-unit/devicestorage-dao-test',
|
'test/unit/devicestorage-dao-test',
|
||||||
'test/new-unit/dialog-ctrl-test',
|
'test/unit/dialog-ctrl-test',
|
||||||
'test/new-unit/add-account-ctrl-test',
|
'test/unit/add-account-ctrl-test',
|
||||||
'test/new-unit/account-ctrl-test',
|
'test/unit/account-ctrl-test',
|
||||||
'test/new-unit/set-passphrase-ctrl-test',
|
'test/unit/set-passphrase-ctrl-test',
|
||||||
'test/new-unit/contacts-ctrl-test',
|
'test/unit/contacts-ctrl-test',
|
||||||
'test/new-unit/login-existing-ctrl-test',
|
'test/unit/login-existing-ctrl-test',
|
||||||
'test/new-unit/login-initial-ctrl-test',
|
'test/unit/login-initial-ctrl-test',
|
||||||
'test/new-unit/login-new-device-ctrl-test',
|
'test/unit/login-new-device-ctrl-test',
|
||||||
'test/new-unit/login-ctrl-test',
|
'test/unit/login-ctrl-test',
|
||||||
'test/new-unit/read-ctrl-test',
|
'test/unit/read-ctrl-test',
|
||||||
'test/new-unit/navigation-ctrl-test',
|
'test/unit/navigation-ctrl-test',
|
||||||
'test/new-unit/mail-list-ctrl-test',
|
'test/unit/mail-list-ctrl-test',
|
||||||
'test/new-unit/write-ctrl-test',
|
'test/unit/write-ctrl-test',
|
||||||
'test/new-unit/outbox-bo-test',
|
'test/unit/outbox-bo-test',
|
||||||
'test/new-unit/invitation-dao-test',
|
'test/unit/invitation-dao-test',
|
||||||
'test/new-unit/update-handler-test'
|
'test/unit/update-handler-test'
|
||||||
], function() {
|
], function() {
|
||||||
//Tests loaded, run tests
|
//Tests loaded, run tests
|
||||||
mocha.run();
|
mocha.run();
|
||||||
|
Loading…
Reference in New Issue
Block a user