Skip to content

E
edx-ora2
Commit 54a2cc4b by Andy Armstrong
Options

Merge pull request #740 from edx/andya/karma-debugging 

Add ability to run individual Jasmine tests
parents 808b3feb 5e24752c
Showing with 157 additions and 856 deletions
Makefile
...@@ -35,6 +35,10 @@ javascript: ...@@ -35,6 +35,10 @@ javascript:
node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js $(STATIC_JS)/src/studio/*.js > "$(STATIC_JS)/openassessment-studio.min.js" node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js $(STATIC_JS)/src/studio/*.js > "$(STATIC_JS)/openassessment-studio.min.js"
sass:
./scripts/sass.sh
install-test: install-test:
pip install -q -r requirements/test.txt pip install -q -r requirements/test.txt
...@@ -44,7 +48,7 @@ install-dev: ...@@ -44,7 +48,7 @@ install-dev:
gem install sass gem install sass
pip install -q -r requirements/dev.txt pip install -q -r requirements/dev.txt
install: install-wheels install-python install-js install-nltk-data install-test install-dev javascript install: install-wheels install-python install-js install-nltk-data install-test install-dev javascript sass
quality: quality:
jshint openassessment/xblock/static/js/src -c .jshintrc --verbose jshint openassessment/xblock/static/js/src -c .jshintrc --verbose
...@@ -52,11 +56,11 @@ quality: ...@@ -52,11 +56,11 @@ quality:
test: quality test: quality
./scripts/test.sh ./scripts/test.sh
test-js: render-templates:
./scripts/render-templates.sh
test-js: render-templates
./scripts/test-js.sh ./scripts/test-js.sh
test-js-debug: test-js-debug: render-templates
./scripts/js-debugger.sh ./scripts/js-debugger.sh
sass:
./scripts/sass.sh
karma.conf.js
...@@ -8,16 +8,19 @@ module.exports = function(config) { ...@@ -8,16 +8,19 @@ module.exports = function(config) {
plugins: [ plugins: [
'karma-coverage',
'karma-jasmine', 'karma-jasmine',
'karma-jasmine-jquery',
'karma-chrome-launcher', 'karma-chrome-launcher',
'karma-phantomjs-launcher', 'karma-phantomjs-launcher',
'karma-coverage',
'karma-sinon',
'karma-jasmine-html-reporter',
'karma-spec-reporter' 'karma-spec-reporter'
], ],
// frameworks to use // frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['jasmine'], frameworks: ['jasmine-jquery', 'jasmine', 'sinon'],
// list of files / patterns to load in the browser // list of files / patterns to load in the browser
...@@ -60,7 +63,7 @@ module.exports = function(config) { ...@@ -60,7 +63,7 @@ module.exports = function(config) {
reporters: ['spec', 'coverage'], reporters: ['spec', 'coverage'],
coverageReporter: { coverageReporter: {
type : 'text' type : 'text'
}, },
// web server port // web server port
......
openassessment/xblock/static/js/lib/jasmine-jquery.js deleted 100644 → 0
/*!
Jasmine-jQuery: a set of jQuery helpers for Jasmine tests.
Version 1.7.0
https://github.com/velesin/jasmine-jquery
Copyright (c) 2010-2013 Wojciech Zawistowski, Travis Jeffery
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+function (jasmine, $) { "use strict";
jasmine.spiedEventsKey = function (selector, eventName) {
return [$(selector).selector, eventName].toString()
}
jasmine.getFixtures = function () {
return jasmine.currentFixtures_ = jasmine.currentFixtures_ || new jasmine.Fixtures()
}
jasmine.getStyleFixtures = function () {
return jasmine.currentStyleFixtures_ = jasmine.currentStyleFixtures_ || new jasmine.StyleFixtures()
}
jasmine.Fixtures = function () {
this.containerId = 'jasmine-fixtures'
this.fixturesCache_ = {}
this.fixturesPath = 'spec/javascripts/fixtures'
}
jasmine.Fixtures.prototype.set = function (html) {
this.cleanUp()
return this.createContainer_(html)
}
jasmine.Fixtures.prototype.appendSet= function (html) {
this.addToContainer_(html)
}
jasmine.Fixtures.prototype.preload = function () {
this.read.apply(this, arguments)
}
jasmine.Fixtures.prototype.load = function () {
this.cleanUp()
this.createContainer_(this.read.apply(this, arguments))
}
jasmine.Fixtures.prototype.appendLoad = function () {
this.addToContainer_(this.read.apply(this, arguments))
}
jasmine.Fixtures.prototype.read = function () {
var htmlChunks = []
, fixtureUrls = arguments
for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
htmlChunks.push(this.getFixtureHtml_(fixtureUrls[urlIndex]))
}
return htmlChunks.join('')
}
jasmine.Fixtures.prototype.clearCache = function () {
this.fixturesCache_ = {}
}
jasmine.Fixtures.prototype.cleanUp = function () {
$('#' + this.containerId).remove()
}
jasmine.Fixtures.prototype.sandbox = function (attributes) {
var attributesToSet = attributes || {}
return $('<div id="sandbox" />').attr(attributesToSet)
}
jasmine.Fixtures.prototype.createContainer_ = function (html) {
var container = $('<div>')
.attr('id', this.containerId)
.html(html)
$(document.body).append(container)
return container
}
jasmine.Fixtures.prototype.addToContainer_ = function (html){
var container = $(document.body).find('#'+this.containerId).append(html)
if(!container.length){
this.createContainer_(html)
}
}
jasmine.Fixtures.prototype.getFixtureHtml_ = function (url) {
if (typeof this.fixturesCache_[url] === 'undefined') {
this.loadFixtureIntoCache_(url)
}
return this.fixturesCache_[url]
}
jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function (relativeUrl) {
var self = this
, url = this.makeFixtureUrl_(relativeUrl)
, request = $.ajax({
async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
cache: false,
url: url,
success: function (data, status, $xhr) {
self.fixturesCache_[relativeUrl] = $xhr.responseText
},
error: function (jqXHR, status, errorThrown) {
throw new Error('Fixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')')
}
})
}
jasmine.Fixtures.prototype.makeFixtureUrl_ = function (relativeUrl){
return this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
}
jasmine.Fixtures.prototype.proxyCallTo_ = function (methodName, passedArguments) {
return this[methodName].apply(this, passedArguments)
}
jasmine.StyleFixtures = function () {
this.fixturesCache_ = {}
this.fixturesNodes_ = []
this.fixturesPath = 'spec/javascripts/fixtures'
}
jasmine.StyleFixtures.prototype.set = function (css) {
this.cleanUp()
this.createStyle_(css)
}
jasmine.StyleFixtures.prototype.appendSet = function (css) {
this.createStyle_(css)
}
jasmine.StyleFixtures.prototype.preload = function () {
this.read_.apply(this, arguments)
}
jasmine.StyleFixtures.prototype.load = function () {
this.cleanUp()
this.createStyle_(this.read_.apply(this, arguments))
}
jasmine.StyleFixtures.prototype.appendLoad = function () {
this.createStyle_(this.read_.apply(this, arguments))
}
jasmine.StyleFixtures.prototype.cleanUp = function () {
while(this.fixturesNodes_.length) {
this.fixturesNodes_.pop().remove()
}
}
jasmine.StyleFixtures.prototype.createStyle_ = function (html) {
var styleText = $('<div></div>').html(html).text()
, style = $('<style>' + styleText + '</style>')
this.fixturesNodes_.push(style)
$('head').append(style)
}
jasmine.StyleFixtures.prototype.clearCache = jasmine.Fixtures.prototype.clearCache
jasmine.StyleFixtures.prototype.read_ = jasmine.Fixtures.prototype.read
jasmine.StyleFixtures.prototype.getFixtureHtml_ = jasmine.Fixtures.prototype.getFixtureHtml_
jasmine.StyleFixtures.prototype.loadFixtureIntoCache_ = jasmine.Fixtures.prototype.loadFixtureIntoCache_
jasmine.StyleFixtures.prototype.makeFixtureUrl_ = jasmine.Fixtures.prototype.makeFixtureUrl_
jasmine.StyleFixtures.prototype.proxyCallTo_ = jasmine.Fixtures.prototype.proxyCallTo_
jasmine.getJSONFixtures = function () {
return jasmine.currentJSONFixtures_ = jasmine.currentJSONFixtures_ || new jasmine.JSONFixtures()
}
jasmine.JSONFixtures = function () {
this.fixturesCache_ = {}
this.fixturesPath = 'spec/javascripts/fixtures/json'
}
jasmine.JSONFixtures.prototype.load = function () {
this.read.apply(this, arguments)
return this.fixturesCache_
}
jasmine.JSONFixtures.prototype.read = function () {
var fixtureUrls = arguments
for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
this.getFixtureData_(fixtureUrls[urlIndex])
}
return this.fixturesCache_
}
jasmine.JSONFixtures.prototype.clearCache = function () {
this.fixturesCache_ = {}
}
jasmine.JSONFixtures.prototype.getFixtureData_ = function (url) {
if (!this.fixturesCache_[url]) this.loadFixtureIntoCache_(url)
return this.fixturesCache_[url]
}
jasmine.JSONFixtures.prototype.loadFixtureIntoCache_ = function (relativeUrl) {
var self = this
, url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
$.ajax({
async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
cache: false,
dataType: 'json',
url: url,
success: function (data) {
self.fixturesCache_[relativeUrl] = data
},
error: function (jqXHR, status, errorThrown) {
throw new Error('JSONFixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')')
}
})
}
jasmine.JSONFixtures.prototype.proxyCallTo_ = function (methodName, passedArguments) {
return this[methodName].apply(this, passedArguments)
}
jasmine.jQuery = function () {}
jasmine.jQuery.browserTagCaseIndependentHtml = function (html) {
return $('<div/>').append(html).html()
}
jasmine.jQuery.elementToString = function (element) {
return $(element).map(function () { return this.outerHTML; }).toArray().join(', ')
}
jasmine.jQuery.matchersClass = {}
var data = {
spiedEvents: {}
, handlers: []
}
jasmine.jQuery.events = {
spyOn: function (selector, eventName) {
var handler = function (e) {
data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = jasmine.util.argsToArray(arguments)
}
$(selector).on(eventName, handler)
data.handlers.push(handler)
return {
selector: selector,
eventName: eventName,
handler: handler,
reset: function (){
delete data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
}
}
},
args: function (selector, eventName) {
var actualArgs = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
if (!actualArgs) {
throw "There is no spy for " + eventName + " on " + selector.toString() + ". Make sure to create a spy using spyOnEvent."
}
return actualArgs
},
wasTriggered: function (selector, eventName) {
return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)])
},
wasTriggeredWith: function (selector, eventName, expectedArgs, env) {
var actualArgs = jasmine.jQuery.events.args(selector, eventName).slice(1)
if (Object.prototype.toString.call(expectedArgs) !== '[object Array]') {
actualArgs = actualArgs[0]
}
return env.equals_(expectedArgs, actualArgs)
},
wasPrevented: function (selector, eventName) {
var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
, e = args ? args[0] : undefined
return e && e.isDefaultPrevented()
},
wasStopped: function (selector, eventName) {
var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
, e = args ? args[0] : undefined
return e && e.isPropagationStopped()
},
cleanUp: function () {
data.spiedEvents = {}
data.handlers = []
}
}
var jQueryMatchers = {
toHaveClass: function (className) {
return this.actual.hasClass(className)
},
toHaveCss: function (css){
for (var prop in css){
var value = css[prop]
// see issue #147 on gh
;if (value === 'auto' && this.actual.get(0).style[prop] === 'auto') continue
if (this.actual.css(prop) !== value) return false
}
return true
},
toBeVisible: function () {
return this.actual.is(':visible')
},
toBeHidden: function () {
return this.actual.is(':hidden')
},
toBeSelected: function () {
return this.actual.is(':selected')
},
toBeChecked: function () {
return this.actual.is(':checked')
},
toBeEmpty: function () {
return this.actual.is(':empty')
},
toBeInDOM: function () {
return $.contains(document.documentElement, this.actual[0])
},
toExist: function () {
return this.actual.length
},
toHaveLength: function (length) {
return this.actual.length === length
},
toHaveAttr: function (attributeName, expectedAttributeValue) {
return hasProperty(this.actual.attr(attributeName), expectedAttributeValue)
},
toHaveProp: function (propertyName, expectedPropertyValue) {
return hasProperty(this.actual.prop(propertyName), expectedPropertyValue)
},
toHaveId: function (id) {
return this.actual.attr('id') == id
},
toHaveHtml: function (html) {
return this.actual.html() == jasmine.jQuery.browserTagCaseIndependentHtml(html)
},
toContainHtml: function (html){
var actualHtml = this.actual.html()
, expectedHtml = jasmine.jQuery.browserTagCaseIndependentHtml(html)
return (actualHtml.indexOf(expectedHtml) >= 0)
},
toHaveText: function (text) {
var trimmedText = $.trim(this.actual.text())
if (text && $.isFunction(text.test)) {
return text.test(trimmedText)
} else {
return trimmedText == text
}
},
toContainText: function (text) {
var trimmedText = $.trim(this.actual.text())
if (text && $.isFunction(text.test)) {
return text.test(trimmedText)
} else {
return trimmedText.indexOf(text) != -1
}
},
toHaveValue: function (value) {
return this.actual.val() === value
},
toHaveData: function (key, expectedValue) {
return hasProperty(this.actual.data(key), expectedValue)
},
toBe: function (selector) {
return this.actual.is(selector)
},
toContain: function (selector) {
return this.actual.find(selector).length
},
toBeMatchedBy: function (selector) {
return this.actual.filter(selector).length
},
toBeDisabled: function (selector){
return this.actual.is(':disabled')
},
toBeFocused: function (selector) {
return this.actual[0] === this.actual[0].ownerDocument.activeElement
},
toHandle: function (event) {
var events = $._data(this.actual.get(0), "events")
if(!events || !event || typeof event !== "string") {
return false
}
var namespaces = event.split(".")
, eventType = namespaces.shift()
, sortedNamespaces = namespaces.slice(0).sort()
, namespaceRegExp = new RegExp("(^|\\.)" + sortedNamespaces.join("\\.(?:.*\\.)?") + "(\\.|$)")
if(events[eventType] && namespaces.length) {
for(var i = 0; i < events[eventType].length; i++) {
var namespace = events[eventType][i].namespace
if(namespaceRegExp.test(namespace)) {
return true
}
}
} else {
return events[eventType] && events[eventType].length > 0
}
},
toHandleWith: function (eventName, eventHandler) {
var normalizedEventName = eventName.split('.')[0]
, stack = $._data(this.actual.get(0), "events")[normalizedEventName]
for (var i = 0; i < stack.length; i++) {
if (stack[i].handler == eventHandler) return true
}
return false
}
}
var hasProperty = function (actualValue, expectedValue) {
if (expectedValue === undefined) return actualValue !== undefined
return actualValue === expectedValue
}
var bindMatcher = function (methodName) {
var builtInMatcher = jasmine.Matchers.prototype[methodName]
jasmine.jQuery.matchersClass[methodName] = function () {
if (this.actual
&& (this.actual instanceof $
|| jasmine.isDomNode(this.actual))) {
this.actual = $(this.actual)
var result = jQueryMatchers[methodName].apply(this, arguments)
, element
if (this.actual.get && (element = this.actual.get()[0]) && !$.isWindow(element) && element.tagName !== "HTML")
this.actual = jasmine.jQuery.elementToString(this.actual)
return result
}
if (builtInMatcher) {
return builtInMatcher.apply(this, arguments)
}
return false
}
}
for(var methodName in jQueryMatchers) {
bindMatcher(methodName)
}
beforeEach(function () {
this.addMatchers(jasmine.jQuery.matchersClass)
this.addMatchers({
toHaveBeenTriggeredOn: function (selector) {
this.message = function () {
return [
"Expected event " + this.actual + " to have been triggered on " + selector,
"Expected event " + this.actual + " not to have been triggered on " + selector
]
}
return jasmine.jQuery.events.wasTriggered(selector, this.actual)
}
})
this.addMatchers({
toHaveBeenTriggered: function (){
var eventName = this.actual.eventName
, selector = this.actual.selector
this.message = function () {
return [
"Expected event " + eventName + " to have been triggered on " + selector,
"Expected event " + eventName + " not to have been triggered on " + selector
]
}
return jasmine.jQuery.events.wasTriggered(selector, eventName)
}
})
this.addMatchers({
toHaveBeenTriggeredOnAndWith: function () {
var selector = arguments[0]
, expectedArgs = arguments[1]
, wasTriggered = jasmine.jQuery.events.wasTriggered(selector, this.actual)
this.message = function () {
if (wasTriggered) {
var actualArgs = jasmine.jQuery.events.args(selector, this.actual, expectedArgs)[1]
return [
"Expected event " + this.actual + " to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs),
"Expected event " + this.actual + " not to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs)
]
} else {
return [
"Expected event " + this.actual + " to have been triggered on " + selector,
"Expected event " + this.actual + " not to have been triggered on " + selector
]
}
}
return wasTriggered && jasmine.jQuery.events.wasTriggeredWith(selector, this.actual, expectedArgs, this.env)
}
})
this.addMatchers({
toHaveBeenPreventedOn: function (selector) {
this.message = function () {
return [
"Expected event " + this.actual + " to have been prevented on " + selector,
"Expected event " + this.actual + " not to have been prevented on " + selector
]
}
return jasmine.jQuery.events.wasPrevented(selector, this.actual)
}
})
this.addMatchers({
toHaveBeenPrevented: function () {
var eventName = this.actual.eventName
, selector = this.actual.selector
this.message = function () {
return [
"Expected event " + eventName + " to have been prevented on " + selector,
"Expected event " + eventName + " not to have been prevented on " + selector
]
}
return jasmine.jQuery.events.wasPrevented(selector, eventName)
}
})
this.addMatchers({
toHaveBeenStoppedOn: function (selector) {
this.message = function () {
return [
"Expected event " + this.actual + " to have been stopped on " + selector,
"Expected event " + this.actual + " not to have been stopped on " + selector
]
}
return jasmine.jQuery.events.wasStopped(selector, this.actual)
}
})
this.addMatchers({
toHaveBeenStopped: function () {
var eventName = this.actual.eventName
, selector = this.actual.selector
this.message = function () {
return [
"Expected event " + eventName + " to have been stopped on " + selector,
"Expected event " + eventName + " not to have been stopped on " + selector
]
}
return jasmine.jQuery.events.wasStopped(selector, eventName)
}
})
jasmine.getEnv().addEqualityTester(function (a, b) {
if(a instanceof $ && b instanceof $) {
if(a.size() != b.size()) {
return jasmine.undefined
}
else if(a.is(b)) {
return true
}
}
return jasmine.undefined
})
})
afterEach(function () {
jasmine.getFixtures().cleanUp()
jasmine.getStyleFixtures().cleanUp()
jasmine.jQuery.events.cleanUp()
})
window.readFixtures = function () {
return jasmine.getFixtures().proxyCallTo_('read', arguments)
}
window.preloadFixtures = function () {
jasmine.getFixtures().proxyCallTo_('preload', arguments)
}
window.loadFixtures = function () {
jasmine.getFixtures().proxyCallTo_('load', arguments)
}
window.appendLoadFixtures = function () {
jasmine.getFixtures().proxyCallTo_('appendLoad', arguments)
}
window.setFixtures = function (html) {
return jasmine.getFixtures().proxyCallTo_('set', arguments)
}
window.appendSetFixtures = function () {
jasmine.getFixtures().proxyCallTo_('appendSet', arguments)
}
window.sandbox = function (attributes) {
return jasmine.getFixtures().sandbox(attributes)
}
window.spyOnEvent = function (selector, eventName) {
return jasmine.jQuery.events.spyOn(selector, eventName)
}
window.preloadStyleFixtures = function () {
jasmine.getStyleFixtures().proxyCallTo_('preload', arguments)
}
window.loadStyleFixtures = function () {
jasmine.getStyleFixtures().proxyCallTo_('load', arguments)
}
window.appendLoadStyleFixtures = function () {
jasmine.getStyleFixtures().proxyCallTo_('appendLoad', arguments)
}
window.setStyleFixtures = function (html) {
jasmine.getStyleFixtures().proxyCallTo_('set', arguments)
}
window.appendSetStyleFixtures = function (html) {
jasmine.getStyleFixtures().proxyCallTo_('appendSet', arguments)
}
window.loadJSONFixtures = function () {
return jasmine.getJSONFixtures().proxyCallTo_('load', arguments)
}
window.getJSONFixture = function (url) {
return jasmine.getJSONFixtures().proxyCallTo_('read', arguments)[url]
}
}(window.jasmine, window.jQuery);
openassessment/xblock/static/js/spec/lms/oa_base.js
...@@ -44,26 +44,6 @@ describe("OpenAssessment.BaseView", function() { ...@@ -44,26 +44,6 @@ describe("OpenAssessment.BaseView", function() {
var server = null; var server = null;
var view = null; var view = null;
/**
Wait for subviews to load before executing callback.
Args:
callback (function): Function that takes no arguments.
**/
var loadSubviews = function(callback) {
runs(function() {
view.load();
});
waitsFor(function() {
return !$(".openassessment__steps__step").hasClass('is--loading');
});
runs(function() {
return callback();
});
};
beforeEach(function() { beforeEach(function() {
// Load the DOM fixture // Load the DOM fixture
loadFixtures('oa_base.html'); loadFixtures('oa_base.html');
...@@ -74,31 +54,29 @@ describe("OpenAssessment.BaseView", function() { ...@@ -74,31 +54,29 @@ describe("OpenAssessment.BaseView", function() {
// Create the object under test // Create the object under test
var el = $("#openassessment").get(0); var el = $("#openassessment").get(0);
view = new OpenAssessment.BaseView(runtime, el, server); view = new OpenAssessment.BaseView(runtime, el, server);
view.load();
expect($(".openassessment__steps__step").hasClass('is--loading')).toBeFalsy();
}); });
it("Loads each step", function() { it("Loads each step", function() {
loadSubviews(function() { expect(server.fragmentsLoaded).toContain("submission");
expect(server.fragmentsLoaded).toContain("submission"); expect(server.fragmentsLoaded).toContain("student_training");
expect(server.fragmentsLoaded).toContain("student_training"); expect(server.fragmentsLoaded).toContain("self_assessment");
expect(server.fragmentsLoaded).toContain("self_assessment"); expect(server.fragmentsLoaded).toContain("peer_assessment");
expect(server.fragmentsLoaded).toContain("peer_assessment"); expect(server.fragmentsLoaded).toContain("grade");
expect(server.fragmentsLoaded).toContain("grade");
});
}); });
it("Only load the peer section once on submit", function() { it("Only load the peer section once on submit", function() {
loadSubviews(function() { // Simulate a server error
// Simulate a server error view.peerView.peerAssess();
view.peerView.peerAssess(); var numPeerLoads = 0;
var numPeerLoads = 0; for (var i = 0; i < server.fragmentsLoaded.length; i++) {
for (var i = 0; i < server.fragmentsLoaded.length; i++) { if (server.fragmentsLoaded[i] == 'peer_assessment') {
if (server.fragmentsLoaded[i] == 'peer_assessment') { numPeerLoads++;
numPeerLoads++;
}
} }
// Peer should be called twice, once when loading the views, }
// and again after the peer has been assessed. // Peer should be called twice, once when loading the views,
expect(numPeerLoads).toBe(2); // and again after the peer has been assessed.
}); expect(numPeerLoads).toBe(2);
}); });
}); });
openassessment/xblock/static/js/spec/lms/oa_peer.js
...@@ -59,7 +59,7 @@ describe("OpenAssessment.PeerView", function() { ...@@ -59,7 +59,7 @@ describe("OpenAssessment.PeerView", function() {
}); });
it("Sends a peer assessment to the server", function() { it("Sends a peer assessment to the server", function() {
spyOn(server, 'peerAssess').andCallThrough(); spyOn(server, 'peerAssess').and.callThrough();
// Select options in the rubric // Select options in the rubric
var optionsSelected = {}; var optionsSelected = {};
...@@ -90,7 +90,7 @@ describe("OpenAssessment.PeerView", function() { ...@@ -90,7 +90,7 @@ describe("OpenAssessment.PeerView", function() {
it("Re-enables the peer assess button on error", function() { it("Re-enables the peer assess button on error", function() {
// Simulate a server error // Simulate a server error
spyOn(server, 'peerAssess').andCallFake(function() { spyOn(server, 'peerAssess').and.callFake(function() {
expect(view.peerSubmitEnabled()).toBe(false); expect(view.peerSubmitEnabled()).toBe(false);
return $.Deferred(function(defer) { return $.Deferred(function(defer) {
defer.rejectWith(this, ['ENOUNKNOWN', 'Error occurred!']); defer.rejectWith(this, ['ENOUNKNOWN', 'Error occurred!']);
...@@ -106,7 +106,7 @@ describe("OpenAssessment.PeerView", function() { ...@@ -106,7 +106,7 @@ describe("OpenAssessment.PeerView", function() {
jasmine.getFixtures().fixturesPath = 'base/fixtures'; jasmine.getFixtures().fixturesPath = 'base/fixtures';
loadFixtures('oa_peer_complete.html'); loadFixtures('oa_peer_complete.html');
// Simulate a server error // Simulate a server error
spyOn(server, 'renderContinuedPeer').andCallFake(function() { spyOn(server, 'renderContinuedPeer').and.callFake(function() {
expect(view.continueAssessmentEnabled()).toBe(false); expect(view.continueAssessmentEnabled()).toBe(false);
return $.Deferred(function(defer) { return $.Deferred(function(defer) {
defer.rejectWith(this, ['Error occurred!']); defer.rejectWith(this, ['Error occurred!']);
......
openassessment/xblock/static/js/spec/lms/oa_response.js
...@@ -114,7 +114,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -114,7 +114,7 @@ describe("OpenAssessment.ResponseView", function() {
// To instead simulate the user cancelling the submission, // To instead simulate the user cancelling the submission,
// set `stubConfirm` to false. // set `stubConfirm` to false.
setStubConfirm(true); setStubConfirm(true);
spyOn(view, 'confirmSubmission').andCallFake(function() { spyOn(view, 'confirmSubmission').and.callFake(function() {
return $.Deferred(function(defer) { return $.Deferred(function(defer) {
if (stubConfirm) { defer.resolve(); } if (stubConfirm) { defer.resolve(); }
else { defer.reject(); } else { defer.reject(); }
...@@ -125,6 +125,9 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -125,6 +125,9 @@ describe("OpenAssessment.ResponseView", function() {
afterEach(function() { afterEach(function() {
// Disable autosave polling (if it was enabled) // Disable autosave polling (if it was enabled)
view.setAutoSaveEnabled(false); view.setAutoSaveEnabled(false);
// Disable the unsaved page warning (if set)
view.unsavedWarningEnabled(false);
}); });
it("updates and retrieves response text correctly", function() { it("updates and retrieves response text correctly", function() {
...@@ -195,14 +198,14 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -195,14 +198,14 @@ describe("OpenAssessment.ResponseView", function() {
}); });
it("sends the saved submission to the server", function() { it("sends the saved submission to the server", function() {
spyOn(server, 'save').andCallThrough(); spyOn(server, 'save').and.callThrough();
view.response(['Test response 1', 'Test response 2']); view.response(['Test response 1', 'Test response 2']);
view.save(); view.save();
expect(server.save).toHaveBeenCalledWith(['Test response 1', 'Test response 2']); expect(server.save).toHaveBeenCalledWith(['Test response 1', 'Test response 2']);
}); });
it("submits a response to the server", function() { it("submits a response to the server", function() {
spyOn(server, 'submit').andCallThrough(); spyOn(server, 'submit').and.callThrough();
view.response(['Test response 1', 'Test response 2']); view.response(['Test response 1', 'Test response 2']);
view.submit(); view.submit();
expect(server.submit).toHaveBeenCalledWith(['Test response 1', 'Test response 2']); expect(server.submit).toHaveBeenCalledWith(['Test response 1', 'Test response 2']);
...@@ -211,7 +214,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -211,7 +214,7 @@ describe("OpenAssessment.ResponseView", function() {
it("allows the user to cancel before submitting", function() { it("allows the user to cancel before submitting", function() {
// Simulate the user cancelling the submission // Simulate the user cancelling the submission
setStubConfirm(false); setStubConfirm(false);
spyOn(server, 'submit').andCallThrough(); spyOn(server, 'submit').and.callThrough();
// Start a submission // Start a submission
view.response(['Test response 1', 'Test response 2']); view.response(['Test response 1', 'Test response 2']);
...@@ -224,7 +227,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -224,7 +227,7 @@ describe("OpenAssessment.ResponseView", function() {
it("disables the submit button on submission", function() { it("disables the submit button on submission", function() {
// Prevent the server's response from resolving, // Prevent the server's response from resolving,
// so we can see what happens before view gets re-rendered. // so we can see what happens before view gets re-rendered.
spyOn(server, 'submit').andCallFake(function() { spyOn(server, 'submit').and.callFake(function() {
return $.Deferred(function(defer) {}).promise(); return $.Deferred(function(defer) {}).promise();
}); });
...@@ -235,7 +238,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -235,7 +238,7 @@ describe("OpenAssessment.ResponseView", function() {
it("re-enables the submit button on submission error", function() { it("re-enables the submit button on submission error", function() {
// Simulate a server error // Simulate a server error
spyOn(server, 'submit').andCallFake(function() { spyOn(server, 'submit').and.callFake(function() {
return $.Deferred(function(defer) { return $.Deferred(function(defer) {
defer.rejectWith(this, ['ENOUNKNOWN', 'Error occurred!']); defer.rejectWith(this, ['ENOUNKNOWN', 'Error occurred!']);
}).promise(); }).promise();
...@@ -251,7 +254,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -251,7 +254,7 @@ describe("OpenAssessment.ResponseView", function() {
it("re-enables the submit button after cancelling", function() { it("re-enables the submit button after cancelling", function() {
// Simulate the user cancelling the submission // Simulate the user cancelling the submission
setStubConfirm(false); setStubConfirm(false);
spyOn(server, 'submit').andCallThrough(); spyOn(server, 'submit').and.callThrough();
// Start a submission // Start a submission
view.response(['Test response 1', 'Test response 2']); view.response(['Test response 1', 'Test response 2']);
...@@ -263,7 +266,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -263,7 +266,7 @@ describe("OpenAssessment.ResponseView", function() {
it("moves to the next step on duplicate submission error", function() { it("moves to the next step on duplicate submission error", function() {
// Simulate a "multiple submissions" server error // Simulate a "multiple submissions" server error
spyOn(server, 'submit').andCallFake(function() { spyOn(server, 'submit').and.callFake(function() {
return $.Deferred(function(defer) { return $.Deferred(function(defer) {
defer.rejectWith(this, ['ENOMULTI', 'Multiple submissions error']); defer.rejectWith(this, ['ENOMULTI', 'Multiple submissions error']);
}).promise(); }).promise();
...@@ -313,108 +316,116 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -313,108 +316,116 @@ describe("OpenAssessment.ResponseView", function() {
expect(view.unsavedWarningEnabled()).toBe(false); expect(view.unsavedWarningEnabled()).toBe(false);
}); });
it("autosaves after a user changes a response", function() { describe("auto save", function() {
// Disable the autosave delay after changing/saving a response beforeEach(function() {
view.AUTO_SAVE_WAIT = -1; jasmine.clock().install();
});
// Check that the problem is initially unsaved afterEach(function() {
expect(view.saveStatus()).toContain('not been saved'); jasmine.clock().uninstall();
});
// Change the response it("autosaves after a user changes a response", function() {
view.response(['Lorem ipsum 1', 'Lorem ipsum 2']); // Disable the autosave delay after changing/saving a response
view.handleResponseChanged(); view.AUTO_SAVE_WAIT = -1;
// Usually autosave would be called by a timer. // Check that the problem is initially unsaved
// For testing purposes, we disable the timer expect(view.saveStatus()).toContain('not been saved');
// and trigger the autosave manually.
view.autoSave();
// Expect that the problem has been saved // Change the response
expect(view.saveStatus()).toContain('saved but not submitted'); view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
view.handleResponseChanged();
// Expect that the unsaved warning is disabled // Usually autosave would be called by a timer.
expect(view.unsavedWarningEnabled()).toBe(false); // For testing purposes, we disable the timer
}); // and trigger the autosave manually.
view.autoSave();
// Expect that the problem has been saved
expect(view.saveStatus()).toContain('saved but not submitted');
// Expect that the unsaved warning is disabled
expect(view.unsavedWarningEnabled()).toBe(false);
});
it("schedules autosave polling", function() { it("schedules autosave polling", function() {
runs(function() {
// Spy on the autosave call // Spy on the autosave call
spyOn(view, 'autoSave').andCallThrough(); spyOn(view, 'autoSave').and.callThrough();
// Enable autosave with a short poll interval // Enable autosave with a short poll interval
view.AUTO_SAVE_POLL_INTERVAL = 1; view.AUTO_SAVE_POLL_INTERVAL = 1;
view.setAutoSaveEnabled(true); view.setAutoSaveEnabled(true);
// Expect that auto save has happened after the poll interval
jasmine.clock().tick(10);
expect(view.autoSave.calls.count() > 0).toBeTruthy();
}); });
// Wait for autosave to be called it("stops autosaving after a save error", function() {
waitsFor(function() { // Disable the autosave delay after changing/saving a response
return view.autoSave.callCount > 0; view.AUTO_SAVE_WAIT = -1;
}, "AutoSave should have been called", 5000);
});
it("stops autosaving after a save error", function() { // Simulate a server error
// Disable the autosave delay after changing/saving a response var errorPromise = $.Deferred(function(defer) {
view.AUTO_SAVE_WAIT = -1; defer.rejectWith(this, ["This response could not be saved"]);
}).promise();
spyOn(server, 'save').and.callFake(function() { return errorPromise; });
// Simulate a server error // Change the response and save it
var errorPromise = $.Deferred(function(defer) { view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
defer.rejectWith(this, ["This response could not be saved"]); view.handleResponseChanged();
}).promise(); view.save();
spyOn(server, 'save').andCallFake(function() { return errorPromise; });
// Change the response and save it // Expect that the save status shows an error
view.response(['Lorem ipsum 1', 'Lorem ipsum 2']); expect(view.saveStatus()).toContain('Error');
view.handleResponseChanged();
view.save();
// Expect that the save status shows an error // Autosave (usually would be called by a timer, but we disable
expect(view.saveStatus()).toContain('Error'); // that for testing purposes).
view.autoSave();
// Autosave (usually would be called by a timer, but we disable // The server save should have been called just once
// that for testing purposes). // (autosave didn't call it).
view.autoSave(); expect(server.save.calls.count()).toEqual(1);
});
// The server save shoulde have been called just once it("waits after user changes a response to autosave", function() {
// (autosave didn't call it). // Set a long autosave delay
expect(server.save.callCount).toEqual(1); view.AUTO_SAVE_WAIT = 900000;
});
it("waits after user changes a response to autosave", function() { // Change the response
// Set a long autosave delay view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
view.AUTO_SAVE_WAIT = 900000; view.handleResponseChanged();
// Change the response // Autosave
view.response(['Lorem ipsum 1', 'Lorem ipsum 2']); view.autoSave();
view.handleResponseChanged();
// Autosave // Expect that the problem is still unsaved
view.autoSave(); expect(view.saveStatus()).toContain('not been saved');
});
// Expect that the problem is still unsaved it("does not autosave if a user hasn't changed the response", function() {
expect(view.saveStatus()).toContain('not been saved'); // Disable the autosave delay after changing/saving a response
}); view.AUTO_SAVE_WAIT = -1;
it("does not autosave if a user hasn't changed the response", function() { // Autosave (usually would be called by a timer, but we disable
// Disable the autosave delay after changing/saving a response // that for testing purposes).
view.AUTO_SAVE_WAIT = -1; view.autoSave();
// Autosave (usually would be called by a timer, but we disable // Since we haven't made any changes, the response should still be unsaved.
// that for testing purposes). expect(view.saveStatus()).toContain('not been saved');
view.autoSave(); });
// Since we haven't made any changes, the response should still be unsaved.
expect(view.saveStatus()).toContain('not been saved');
}); });
it("selects too large of a file", function() { it("selects too large of a file", function() {
spyOn(baseView, 'toggleActionError').andCallThrough(); spyOn(baseView, 'toggleActionError').and.callThrough();
var files = [{type: 'image/jpg', size: 6000000, name: 'huge-picture.jpg', data: ''}]; var files = [{type: 'image/jpg', size: 6000000, name: 'huge-picture.jpg', data: ''}];
view.prepareUpload(files); view.prepareUpload(files);
expect(baseView.toggleActionError).toHaveBeenCalledWith('upload', 'File size must be 5MB or less.'); expect(baseView.toggleActionError).toHaveBeenCalledWith('upload', 'File size must be 5MB or less.');
}); });
it("selects the wrong file type", function() { it("selects the wrong file type", function() {
spyOn(baseView, 'toggleActionError').andCallThrough(); spyOn(baseView, 'toggleActionError').and.callThrough();
var files = [{type: 'bogus/jpg', size: 1024, name: 'picture.exe', data: ''}]; var files = [{type: 'bogus/jpg', size: 1024, name: 'picture.exe', data: ''}];
view.prepareUpload(files); view.prepareUpload(files);
expect(baseView.toggleActionError).toHaveBeenCalledWith('upload', 'File must be an image.'); expect(baseView.toggleActionError).toHaveBeenCalledWith('upload', 'File must be an image.');
...@@ -431,7 +442,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -431,7 +442,7 @@ describe("OpenAssessment.ResponseView", function() {
it("displays an error if a one-time file upload URL cannot be retrieved", function() { it("displays an error if a one-time file upload URL cannot be retrieved", function() {
// Configure the server to fail when retrieving the one-time URL // Configure the server to fail when retrieving the one-time URL
server.uploadUrlError = true; server.uploadUrlError = true;
spyOn(baseView, 'toggleActionError').andCallThrough(); spyOn(baseView, 'toggleActionError').and.callThrough();
// Attempt to upload a file // Attempt to upload a file
var files = [{type: 'image/jpg', size: 1024, name: 'picture.jpg', data: ''}]; var files = [{type: 'image/jpg', size: 1024, name: 'picture.jpg', data: ''}];
...@@ -445,7 +456,7 @@ describe("OpenAssessment.ResponseView", function() { ...@@ -445,7 +456,7 @@ describe("OpenAssessment.ResponseView", function() {
it("displays an error if a file could not be uploaded", function() { it("displays an error if a file could not be uploaded", function() {
// Configure the file upload server to return an error // Configure the file upload server to return an error
fileUploader.uploadError = true; fileUploader.uploadError = true;
spyOn(baseView, 'toggleActionError').andCallThrough(); spyOn(baseView, 'toggleActionError').and.callThrough();
// Attempt to upload a file // Attempt to upload a file
var files = [{type: 'image/jpg', size: 1024, name: 'picture.jpg', data: ''}]; var files = [{type: 'image/jpg', size: 1024, name: 'picture.jpg', data: ''}];
......
openassessment/xblock/static/js/spec/lms/oa_self.js
...@@ -54,7 +54,7 @@ describe("OpenAssessment.SelfView", function() { ...@@ -54,7 +54,7 @@ describe("OpenAssessment.SelfView", function() {
}); });
it("Sends a self assessment to the server", function() { it("Sends a self assessment to the server", function() {
spyOn(server, 'selfAssess').andCallThrough(); spyOn(server, 'selfAssess').and.callThrough();
// Select options in the rubric // Select options in the rubric
var optionsSelected = {}; var optionsSelected = {};
...@@ -81,7 +81,7 @@ describe("OpenAssessment.SelfView", function() { ...@@ -81,7 +81,7 @@ describe("OpenAssessment.SelfView", function() {
it("Re-enables the self assess button on error", function() { it("Re-enables the self assess button on error", function() {
// Simulate a server error // Simulate a server error
spyOn(server, 'selfAssess').andCallFake(function() { spyOn(server, 'selfAssess').and.callFake(function() {
expect(view.selfSubmitEnabled()).toBe(false); expect(view.selfSubmitEnabled()).toBe(false);
return $.Deferred(function(defer) { return $.Deferred(function(defer) {
defer.rejectWith(this, ['ENOUNKNOWN', 'Error occurred!']); defer.rejectWith(this, ['ENOUNKNOWN', 'Error occurred!']);
......
openassessment/xblock/static/js/spec/lms/oa_staff_info.js
...@@ -90,7 +90,7 @@ describe("OpenAssessment.StaffInfoView", function() { ...@@ -90,7 +90,7 @@ describe("OpenAssessment.StaffInfoView", function() {
"workflow_uuid": "abc123", "workflow_uuid": "abc123",
"msg": "Great success." "msg": "Great success."
}; };
spyOn(server, 'scheduleTraining').andCallThrough(); spyOn(server, 'scheduleTraining').and.callThrough();
// Load the fixture // Load the fixture
loadFixtures('oa_base.html'); loadFixtures('oa_base.html');
...@@ -131,7 +131,7 @@ describe("OpenAssessment.StaffInfoView", function() { ...@@ -131,7 +131,7 @@ describe("OpenAssessment.StaffInfoView", function() {
var view = new OpenAssessment.StaffInfoView(el, server, baseView); var view = new OpenAssessment.StaffInfoView(el, server, baseView);
view.load(); view.load();
spyOn(server, 'rescheduleUnfinishedTasks').andCallThrough(); spyOn(server, 'rescheduleUnfinishedTasks').and.callThrough();
// Test the Rescheduling // Test the Rescheduling
view.rescheduleUnfinishedTasks(); view.rescheduleUnfinishedTasks();
...@@ -151,7 +151,7 @@ describe("OpenAssessment.StaffInfoView", function() { ...@@ -151,7 +151,7 @@ describe("OpenAssessment.StaffInfoView", function() {
var view = new OpenAssessment.StaffInfoView(el, server, baseView); var view = new OpenAssessment.StaffInfoView(el, server, baseView);
view.load(); view.load();
spyOn(server, 'rescheduleUnfinishedTasks').andCallThrough(); spyOn(server, 'rescheduleUnfinishedTasks').and.callThrough();
// Test the Rescheduling // Test the Rescheduling
view.rescheduleUnfinishedTasks(); view.rescheduleUnfinishedTasks();
...@@ -163,7 +163,7 @@ describe("OpenAssessment.StaffInfoView", function() { ...@@ -163,7 +163,7 @@ describe("OpenAssessment.StaffInfoView", function() {
it("updates submission cancellation button when comments changes", function() { it("updates submission cancellation button when comments changes", function() {
// Prevent the server's response from resolving, // Prevent the server's response from resolving,
// so we can see what happens before view gets re-rendered. // so we can see what happens before view gets re-rendered.
spyOn(server, 'cancelSubmission').andCallFake(function() { spyOn(server, 'cancelSubmission').and.callFake(function() {
return $.Deferred(function(defer) {}).promise(); return $.Deferred(function(defer) {}).promise();
}); });
...@@ -190,7 +190,7 @@ describe("OpenAssessment.StaffInfoView", function() { ...@@ -190,7 +190,7 @@ describe("OpenAssessment.StaffInfoView", function() {
}); });
it("submits the cancel submission comments to the server", function() { it("submits the cancel submission comments to the server", function() {
spyOn(server, 'cancelSubmission').andCallThrough(); spyOn(server, 'cancelSubmission').and.callThrough();
// Load the fixture // Load the fixture
loadFixtures('oa_student_info.html'); loadFixtures('oa_student_info.html');
......
openassessment/xblock/static/js/spec/lms/oa_training.js
...@@ -65,7 +65,7 @@ describe("OpenAssessment.StudentTrainingView", function() { ...@@ -65,7 +65,7 @@ describe("OpenAssessment.StudentTrainingView", function() {
"Criterion 2": "Poor", "Criterion 2": "Poor",
"Criterion 3": "Fair" "Criterion 3": "Fair"
}; };
spyOn(server, 'trainingAssess').andCallThrough(); spyOn(server, 'trainingAssess').and.callThrough();
// Select rubric options // Select rubric options
var optionsSelected = {}; var optionsSelected = {};
...@@ -111,8 +111,8 @@ describe("OpenAssessment.StudentTrainingView", function() { ...@@ -111,8 +111,8 @@ describe("OpenAssessment.StudentTrainingView", function() {
it("reloads the assessment steps when the user submits an assessment", function() { it("reloads the assessment steps when the user submits an assessment", function() {
// Simulate that the user answered the problem correctly, so there are no corrections // Simulate that the user answered the problem correctly, so there are no corrections
server.corrections = {}; server.corrections = {};
spyOn(server, 'trainingAssess').andCallThrough(); spyOn(server, 'trainingAssess').and.callThrough();
spyOn(baseView, 'loadAssessmentModules').andCallThrough(); spyOn(baseView, 'loadAssessmentModules').and.callThrough();
// Select rubric options // Select rubric options
var optionsSelected = {}; var optionsSelected = {};
......
openassessment/xblock/static/js/spec/oa_file_upload.js
...@@ -18,7 +18,7 @@ describe("OpenAssessment.FileUploader", function() { ...@@ -18,7 +18,7 @@ describe("OpenAssessment.FileUploader", function() {
var successPromise = $.Deferred( var successPromise = $.Deferred(
function(defer) { defer.resolve(); } function(defer) { defer.resolve(); }
).promise(); ).promise();
spyOn($, 'ajax').andReturn(successPromise); spyOn($, 'ajax').and.returnValue(successPromise);
// Stub the event logger // Stub the event logger
spyOn(Logger, 'log'); spyOn(Logger, 'log');
......
openassessment/xblock/static/js/spec/oa_server.js
...@@ -24,7 +24,7 @@ describe("OpenAssessment.Server", function() { ...@@ -24,7 +24,7 @@ describe("OpenAssessment.Server", function() {
call completes successfully. call completes successfully.
**/ **/
var stubAjax = function(success, responseData) { var stubAjax = function(success, responseData) {
spyOn($, 'ajax').andReturn( spyOn($, 'ajax').and.returnValue(
$.Deferred(function(defer) { $.Deferred(function(defer) {
if (success) { defer.resolveWith(this, [responseData]); } if (success) { defer.resolveWith(this, [responseData]); }
else { defer.reject(); } else { defer.reject(); }
......
openassessment/xblock/static/js/spec/studio/oa_edit.js
...@@ -175,7 +175,7 @@ describe("OpenAssessment.StudioView", function() { ...@@ -175,7 +175,7 @@ describe("OpenAssessment.StudioView", function() {
server.isReleased = true; server.isReleased = true;
// Stub the confirmation step (avoid showing the dialog) // Stub the confirmation step (avoid showing the dialog)
spyOn(view, 'confirmPostReleaseUpdate').andCallFake( spyOn(view, 'confirmPostReleaseUpdate').and.callFake(
function(onConfirm) { onConfirm(); } function(onConfirm) { onConfirm(); }
); );
......
openassessment/xblock/static/js/spec/studio/oa_edit_settings.js
...@@ -210,7 +210,7 @@ describe("OpenAssessment.EditSettingsView", function() { ...@@ -210,7 +210,7 @@ describe("OpenAssessment.EditSettingsView", function() {
// Spy on the assessment view's validate() method so we can // Spy on the assessment view's validate() method so we can
// verify that it doesn't get called (thus marking the DOM) // verify that it doesn't get called (thus marking the DOM)
spyOn(assessmentViews[PEER], 'validate').andCallThrough(); spyOn(assessmentViews[PEER], 'validate').and.callThrough();
// Expect that the parent view is still valid // Expect that the parent view is still valid
expect(view.validate()).toBe(true); expect(view.validate()).toBe(true);
......
package.json
...@@ -3,12 +3,18 @@ ...@@ -3,12 +3,18 @@
"version": "0.0.1", "version": "0.0.1",
"repository": "https://github.com/edx/edx-ora2.git", "repository": "https://github.com/edx/edx-ora2.git",
"devDependencies": { "devDependencies": {
"karma": "~0.12", "karma": "^0.12.16",
"karma-chrome-launcher": "0.1.3",
"karma-coverage": "^0.2.6", "karma-coverage": "^0.2.6",
"karma-jasmine": "0.1.5", "karma-jasmine": "^0.3.6",
"karma-jasmine-jquery": "^0.1.1",
"karma-chrome-launcher": "^0.1.4",
"karma-phantomjs-launcher": "^0.1.4", "karma-phantomjs-launcher": "^0.1.4",
"karma-sinon": "^1.0.3",
"karma-jasmine-html-reporter": "~0.1",
"karma-spec-reporter": "^0.0.20", "karma-spec-reporter": "^0.0.20",
"jasmine": "^2.3.0",
"phantomjs": "^1.9.11",
"sinon": "^1.10.3",
"uglify-js": "2.3.6", "uglify-js": "2.3.6",
"jshint": "2.8.0" "jshint": "2.8.0"
}, },
......
scripts/js-debugger.sh
#!/usr/bin/env bash #!/usr/bin/env bash
cd `dirname $BASH_SOURCE` && cd .. cd `dirname $BASH_SOURCE` && cd ..
./scripts/install.sh test
echo "Starting JavaScript tests in a browser..." echo "Starting JavaScript tests in a browser..."
./node_modules/karma/bin/karma start --single-run=false --browsers Chrome ./node_modules/karma/bin/karma start --single-run=false --browsers Chrome --reporters=html --autoWatch
scripts/render-templates.sh 0 → 100755
#!/usr/bin/env bash
cd `dirname $BASH_SOURCE` && cd ..
echo "Generating HTML fixtures for JavaScript tests..."
export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test"}
./scripts/render_templates.py openassessment/xblock/static/js/fixtures/templates.json
scripts/test-js.sh
...@@ -2,9 +2,5 @@ ...@@ -2,9 +2,5 @@
cd `dirname $BASH_SOURCE` && cd .. cd `dirname $BASH_SOURCE` && cd ..
echo "Generating HTML fixtures for JavaScript tests..."
export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test"}
./scripts/render_templates.py openassessment/xblock/static/js/fixtures/templates.json
echo "Running JavaScript tests..." echo "Running JavaScript tests..."
npm test npm test
scripts/test.sh
...@@ -6,5 +6,6 @@ set -e ...@@ -6,5 +6,6 @@ set -e
cd `dirname $BASH_SOURCE` && cd .. cd `dirname $BASH_SOURCE` && cd ..
export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test_with_coverage"} export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-"settings.test_with_coverage"}
./scripts/test-python.sh $1 ./scripts/test-python.sh $1
./scripts/render-templates.sh
./scripts/test-js.sh ./scripts/test-js.sh
./scripts/build-docs.sh ./scripts/build-docs.sh
Markdown is supported
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