ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of unnecessary waitsFor function

Browse Source 
This was a relic from the Jasmine tests.  Mocha tests have a built-in timeout.  Async tests are registered with a function that takes a callback.
This commit is contained in:
Tim Schaub
2013-06-23 11:20:57 -06:00
parent 7a620de1bf
commit d6be28a7bb
3 changed files with 27 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/spec/ol/parser/ogc/exceptionreport.test.js
View File

@@ -6,19 +6,13 @@ describe('ol.parser.ogc.exceptionreport', function() {
var parser = new ol.parser.ogc.ExceptionReport();
describe('test read exception', function() {
it('OCG WMS 1.3.0 exceptions', function(done) {
var result, exceptions;
it('OCG WMS 1.3.0 exceptions', function(done) {
var url = 'spec/ol/parser/ogc/xml/exceptionreport/wms1_3_0.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
result = parser.read(xhr.getResponseXml());
exceptions = result.exceptionReport.exceptions;
});
waitsFor(function() {
return (result !== undefined);
}, 'XHR timeout', 1000, function() {
var result = parser.read(xhr.getResponseXml());
var exceptions = result.exceptionReport.exceptions;
expect(exceptions.length).to.be(4);
var str = 'Plain text message about an error.';
expect(goog.string.trim(exceptions[0].text)).to.be(str);
@@ -40,20 +34,15 @@ describe('ol.parser.ogc.exceptionreport', function() {
done();
});
});
it('test read exception OWSCommon 1.0.0', function(done) {
var result, report, exception;
it('test read exception OWSCommon 1.0.0', function(done) {
var url = 'spec/ol/parser/ogc/xml/exceptionreport/ows1_0_0.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
result = parser.read(xhr.getResponseXml());
report = result.exceptionReport;
exception = report.exceptions[0];
});
var result = parser.read(xhr.getResponseXml());
var report = result.exceptionReport;
var exception = report.exceptions[0];
waitsFor(function() {
return (result !== undefined);
}, 'XHR timeout', 1000, function() {
expect(report.version).to.eql('1.0.0');
expect(report.language).to.eql('en');
expect(exception.code).to.eql('InvalidParameterValue');
@@ -65,20 +54,15 @@ describe('ol.parser.ogc.exceptionreport', function() {
done();
});
});
it('test read exception OWSCommon 1.1.0', function(done) {
var result, report, exception;
it('test read exception OWSCommon 1.1.0', function(done) {
var url = 'spec/ol/parser/ogc/xml/exceptionreport/ows1_1_0.xml';
goog.net.XhrIo.send(url, function(e) {
var xhr = e.target;
result = parser.read(xhr.getResponseXml());
report = result.exceptionReport;
exception = report.exceptions[0];
});
var result = parser.read(xhr.getResponseXml());
var report = result.exceptionReport;
var exception = report.exceptions[0];
waitsFor(function() {
return (result !== undefined);
}, 'XHR timeout', 1000, function() {
expect(report.version).to.eql('1.1.0');
expect(report.language).to.eql('en');
expect(exception.code).to.eql('InvalidParameterValue');