mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-28 11:26:16 -04:00
add tests from origin/develop
This commit is contained in:
parent
6a3e4c69b8
commit
2df2d7d60a
71 changed files with 18931 additions and 4032 deletions
|
@ -65,7 +65,7 @@
|
|||
|
||||
var name = $flags[i]
|
||||
, assertion = new Assertion(this.obj, name, this)
|
||||
|
||||
|
||||
if ('function' == typeof Assertion.prototype[name]) {
|
||||
// clone the function, make sure we dont touch the prot reference
|
||||
var old = this[name];
|
||||
|
@ -148,7 +148,7 @@
|
|||
if ('object' == typeof fn && not) {
|
||||
// in the presence of a matcher, ensure the `not` only applies to
|
||||
// the matching.
|
||||
this.flags.not = false;
|
||||
this.flags.not = false;
|
||||
}
|
||||
|
||||
var name = this.obj.name || 'fn';
|
||||
|
@ -219,7 +219,7 @@
|
|||
};
|
||||
|
||||
/**
|
||||
* Assert within start to finish (inclusive).
|
||||
* Assert within start to finish (inclusive).
|
||||
*
|
||||
* @param {Number} start
|
||||
* @param {Number} finish
|
||||
|
@ -298,7 +298,7 @@
|
|||
, function(){ return 'expected ' + i(this.obj) + ' to be above ' + n });
|
||||
return this;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Assert string value matches _regexp_.
|
||||
*
|
||||
|
@ -359,13 +359,13 @@
|
|||
} catch (e) {
|
||||
hasProp = undefined !== this.obj[name]
|
||||
}
|
||||
|
||||
|
||||
this.assert(
|
||||
hasProp
|
||||
, function(){ return 'expected ' + i(this.obj) + ' to have a property ' + i(name) }
|
||||
, function(){ return 'expected ' + i(this.obj) + ' to not have a property ' + i(name) });
|
||||
}
|
||||
|
||||
|
||||
if (undefined !== val) {
|
||||
this.assert(
|
||||
val === this.obj[name]
|
||||
|
@ -537,7 +537,7 @@
|
|||
return html;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// Returns true if object is a DOM element.
|
||||
var isDOMElement = function (object) {
|
||||
if (typeof HTMLElement === 'object') {
|
||||
|
@ -843,9 +843,9 @@
|
|||
|
||||
expect.eql = function eql (actual, expected) {
|
||||
// 7.1. All identical values are equivalent, as determined by ===.
|
||||
if (actual === expected) {
|
||||
if (actual === expected) {
|
||||
return true;
|
||||
} else if ('undefined' != typeof Buffer
|
||||
} else if ('undefined' != typeof Buffer
|
||||
&& Buffer.isBuffer(actual) && Buffer.isBuffer(expected)) {
|
||||
if (actual.length != expected.length) return false;
|
||||
|
||||
|
|
|
@ -1,40 +0,0 @@
|
|||
//copied from http://stackoverflow.com/questions/8407946/is-it-possible-to-use-iframes-in-ie-without-memory-leaks
|
||||
(function($) {
|
||||
$.fn.purgeFrame = function() {
|
||||
var deferred;
|
||||
var browser = bowser;
|
||||
|
||||
if (browser.msie && parseFloat(browser.version, 10) < 9) {
|
||||
deferred = purge(this);
|
||||
} else {
|
||||
this.remove();
|
||||
deferred = $.Deferred();
|
||||
deferred.resolve();
|
||||
}
|
||||
|
||||
return deferred;
|
||||
};
|
||||
|
||||
function purge($frame) {
|
||||
var sem = $frame.length
|
||||
, deferred = $.Deferred();
|
||||
|
||||
$frame.load(function() {
|
||||
var frame = this;
|
||||
frame.contentWindow.document.innerHTML = '';
|
||||
|
||||
sem -= 1;
|
||||
if (sem <= 0) {
|
||||
$frame.remove();
|
||||
deferred.resolve();
|
||||
}
|
||||
});
|
||||
$frame.attr('src', 'about:blank');
|
||||
|
||||
if ($frame.length === 0) {
|
||||
deferred.resolve();
|
||||
}
|
||||
|
||||
return deferred.promise();
|
||||
}
|
||||
})(jQuery);
|
File diff suppressed because one or more lines are too long
|
@ -305,11 +305,11 @@ var START_TO_END = 1;
|
|||
var END_TO_END = 2;
|
||||
var END_TO_START = 3;
|
||||
// from the Mozilla documentation, for range.compareBoundaryPoints(how, sourceRange)
|
||||
// -1, 0, or 1, indicating whether the corresponding boundary-point of range is respectively before, equal to, or after the corresponding boundary-point of sourceRange.
|
||||
// -1, 0, or 1, indicating whether the corresponding boundary-point of range is respectively before, equal to, or after the corresponding boundary-point of sourceRange.
|
||||
// * Range.END_TO_END compares the end boundary-point of sourceRange to the end boundary-point of range.
|
||||
// * Range.END_TO_START compares the end boundary-point of sourceRange to the start boundary-point of range.
|
||||
// * Range.START_TO_END compares the start boundary-point of sourceRange to the end boundary-point of range.
|
||||
// * Range.START_TO_START compares the start boundary-point of sourceRange to the start boundary-point of range.
|
||||
// * Range.START_TO_START compares the start boundary-point of sourceRange to the start boundary-point of range.
|
||||
function w3cstart(rng, constraint){
|
||||
if (rng.compareBoundaryPoints (START_TO_START, constraint) <= 0) return 0; // at or before the beginning
|
||||
if (rng.compareBoundaryPoints (END_TO_START, constraint) >= 0) return constraint.toString().length;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue