Skip to content

Commit 5966ea6

Browse files
Merge pull request #29 from canjs/all-tests-in-ie
All tests in ie
2 parents 39b3def + 8b70ce6 commit 5966ea6

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

src/types/make-maybe-test.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ var canReflect = require("can-reflect");
77

88
QUnit.module("can-query-logic/types/make-maybe")
99

10-
class DateStringSet {
11-
constructor(value) {
12-
this.value = value;
13-
}
14-
// used to convert to a number
15-
valueOf() {
16-
return this.value == null ? this.value : new Date(this.value).getTime();
17-
}
10+
function DateStringSet(value) {
11+
this.value = value;
1812
}
13+
DateStringSet.prototype.valueOf = function() {
14+
return this.value == null ? this.value : new Date(this.value).getTime();
15+
};
1916

2017
var ComparisonSet = function(value) {
2118
this.value = value;

test/special-comparison-logic-test.js

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var QueryLogic = require("../can-query-logic");
22
var QUnit = require("steal-qunit");
33
var canReflect = require("can-reflect");
4+
var canSymbol = require("can-symbol");
45

56
QUnit.module("can-query-logic special comparison logic");
67

@@ -34,6 +35,10 @@ QUnit.test("where to filter", function(){
3435
}, "got intersection");
3536
});
3637

38+
var stringIncludes = function(strA, strB) {
39+
return strA.indexOf(strB) >= 0;
40+
};
41+
3742
QUnit.test("Searchable string", function(){
3843
// Create a set type that is used to do comparisons.
3944
function SearchableStringSet(value) {
@@ -43,7 +48,7 @@ QUnit.test("Searchable string", function(){
4348
canReflect.assignSymbols(SearchableStringSet.prototype,{
4449
// Returns if the name on a todo is actually a member of the set.
4550
"can.isMember": function(value){
46-
return value.includes(this.value);
51+
return stringIncludes(value, this.value);
4752
},
4853
"can.serialize": function(){
4954
return this.value;
@@ -53,31 +58,31 @@ QUnit.test("Searchable string", function(){
5358
// Specify how to do the fundamental set comparisons.
5459
QueryLogic.defineComparison(SearchableStringSet,SearchableStringSet,{
5560
union: function(searchA, searchB){
56-
if(searchA.value.includes(searchB.value)) {
61+
if(stringIncludes(searchA.value, searchB.value)) {
5762
return searchB;
5863
}
59-
if(searchB.value.includes(searchA.value)) {
64+
if(stringIncludes(searchB.value, searchA.value)) {
6065
return searchA;
6166
}
6267
return new QueryLogic.ValuesOr([searchA, searchB]);
6368
},
6469
// a aa
6570
intersection: function(searchA, searchB){
66-
if(searchA.value.includes(searchB.value)) {
71+
if(stringIncludes(searchA.value, searchB.value)) {
6772
return searchA;
6873
}
69-
if(searchB.value.includes(searchA.value)) {
74+
if(stringIncludes(searchB.value, searchA.value)) {
7075
return searchB;
7176
}
7277
return QueryLogic.UNDEFINABLE;
7378
},
7479
difference: function(searchA, searchB){
7580
// if a is a subset
76-
if(searchA.value.includes(searchB.value)) {
81+
if(stringIncludes(searchA.value, searchB.value)) {
7782
return QueryLogic.EMPTY;
7883
}
7984
// a is a superset
80-
if(searchB.value.includes(searchA.value)) {
85+
if(stringIncludes(searchB.value, searchA.value)) {
8186
return QueryLogic.UNDEFINABLE;
8287
}
8388
// foo \ bar
@@ -100,7 +105,7 @@ QUnit.test("Searchable string", function(){
100105

101106
}
102107

103-
SearchableString[Symbol.for("can.SetType")] = SearchableStringSet;
108+
SearchableString[canSymbol.for("can.SetType")] = SearchableStringSet;
104109

105110
var todoQueryLogic = new QueryLogic({
106111
keys: {

0 commit comments

Comments
 (0)