fix inrange(), mor, mand, if statements

onesimus-wiafe · Oct 12, 2021 · b150d02 · b150d02
1 parent 6f1e06e
commit b150d02
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/packages/perspective/test/js/expressions/numeric.js b/packages/perspective/test/js/expressions/numeric.js
@@ -1321,17 +1321,27 @@ module.exports = (perspective) => {
                 const view = await table.view({
                     expressions: [
                         'mor("u" and "u", "u" and "z", "z" and "z")',
+<<<<<<< HEAD
                         "mor(false, false, false)",
                         "mor(false, true, false)",
+=======
+                        "mor(False, False, False)",
+                        "mor(False, True, False)",
+>>>>>>> fix inrange(), mor, mand, if statements
                     ],
                 });
                 const result = await view.to_columns();
                 expect(
                     result['mor("u" and "u", "u" and "z", "z" and "z")']
                 ).toEqual([true, true, true, true]);
 
+<<<<<<< HEAD
                 // The boolean false is a false
                 expect(result["mor(false, false, false)"]).toEqual([
+=======
+                // The boolean False is a False
+                expect(result["mor(False, False, False)"]).toEqual([
+>>>>>>> fix inrange(), mor, mand, if statements
                     false,
                     false,
                     false,