Commit a0046754 authored by Rafael Ostertag's avatar Rafael Ostertag
Browse files

Moved existing jasmine tests to tests/jasmine/unit in preparation for acceptance tests.

parent bbde5a57
......@@ -315,8 +315,8 @@ module.exports = function (grunt) {
}
},
jasmine: {
frontend: {
src: ['tests/jasmine/spec/*Spec.js'],
unit: {
src: ['tests/jasmine/unit/spec/*Spec.js'],
options: {
vendor: [
'js/jquery.min.js',
......@@ -325,8 +325,8 @@ module.exports = function (grunt) {
'js/jqx-all.js',
'js/qfq.debug.js'
],
helpers: ['tests/jasmine/helper/mock-ajax.js'],
template: 'tests/jasmine/SpecRunner.tmpl'
helpers: ['tests/jasmine/unit/helper/mock-ajax.js'],
template: 'tests/jasmine/unit/SpecRunner.tmpl'
}
}
},
......
......@@ -6,20 +6,20 @@
<link rel="shortcut icon" type="image/png" href="lib/jasmine-2.4.1/jasmine_favicon.png">
<link rel="stylesheet" href="lib/jasmine-2.4.1/jasmine.css">
<link rel="stylesheet" href="../../css/bootstrap.min.css">
<link rel="stylesheet" href="../../css/bootstrap-theme.min.css">
<link rel="stylesheet" href="../../../css/bootstrap.min.css">
<link rel="stylesheet" href="../../../css/bootstrap-theme.min.css">
<script src="lib/jasmine-2.4.1/jasmine.js"></script>
<script src="lib/jasmine-2.4.1/jasmine-html.js"></script>
<script src="lib/jasmine-2.4.1/boot.js"></script>
<script src="helper/mock-ajax.js"></script>
<script src="../../js/jquery.min.js"></script>
<script src="../../js/bootstrap.min.js"></script>
<script src="../../js/EventEmitter.min.js"></script>
<script src="../../../js/jquery.min.js"></script>
<script src="../../../js/bootstrap.min.js"></script>
<script src="../../../js/EventEmitter.min.js"></script>
<!-- include source files here... -->
<script src="../../js/qfq.debug.js"></script>
<script src="../../../js/qfq.debug.js"></script>
<!-- include spec files here... -->
<script src="spec/ElementFormGroupSpec.js"></script>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment