wip

hawkrives · Sep 26, 2018 · c97427e · c97427e
1 parent aa62a13
commit c97427e
Show file tree

Hide file tree

Showing 40 changed files with 1,281 additions and 1,514 deletions.
diff --git a/modules/gob-examine-student/source/__tests__/__snapshots__/apply-filter.test.js.snap b/modules/gob-examine-student/source/__tests__/__snapshots__/apply-filter.test.js.snap
@@ -3,16 +3,11 @@
 exports[`applyFilter filters a list of courses 1`] = `
 Array [
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "ART",
-      "ASIAN",
-    ],
+    "department": "AR/AS",
     "number": 121,
   },
 ]
@@ -22,9 +17,7 @@ exports[`applyFilter filters by list-of-valid-courses queries 1`] = `
 Array [
   Object {
     "$type": "course",
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
 ]
@@ -33,16 +26,11 @@ Array [
 exports[`applyFilter filters by where-style queries 1`] = `
 Array [
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "ART",
-      "ASIAN",
-    ],
+    "department": "AR/AS",
     "number": 121,
   },
 ]
@@ -53,16 +41,11 @@ exports[`applyFilter returns an empty list when not presented with a filter 1`]
 exports[`applyFilter returns the matches on the expression 1`] = `
 Array [
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "ART",
-      "ASIAN",
-    ],
+    "department": "AR/AS",
     "number": 121,
   },
 ]
@@ -71,16 +54,11 @@ Array [
 exports[`applyFilter returns the matches on the expression 2`] = `
 Array [
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "ART",
-      "ASIAN",
-    ],
+    "department": "AR/AS",
     "number": 121,
   },
 ]

diff --git a/modules/gob-examine-student/source/__tests__/__snapshots__/collect-matches.test.js.snap b/modules/gob-examine-student/source/__tests__/__snapshots__/collect-matches.test.js.snap
@@ -3,15 +3,11 @@
 exports[`collectMatches collects matches from "courses" modifiers 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
 ]
@@ -20,15 +16,13 @@ Array [
 exports[`collectMatches collects matches from boolean expressions 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "$type": "course",
+    "_result": true,
+    "department": "ASIAN",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
 ]
@@ -37,15 +31,11 @@ Array [
 exports[`collectMatches collects matches from child requirements 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
 ]
@@ -54,9 +44,7 @@ Array [
 exports[`collectMatches collects matches from course expressions 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
   },
 ]
@@ -65,16 +53,12 @@ Array [
 exports[`collectMatches collects matches from occurrences 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
     "year": 2014,
   },
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
     "year": 2015,
   },
@@ -84,27 +68,19 @@ Array [
 exports[`collectMatches collects matches from of-expressions 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "MUSIC",
-    ],
+    "department": "MUSIC",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "ESTH",
-    ],
+    "department": "ESTH",
     "number": 121,
   },
 ]
@@ -113,9 +89,7 @@ Array [
 exports[`collectMatches collects matches from requirement references 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
   },
 ]
@@ -124,15 +98,11 @@ Array [
 exports[`collectMatches collects matches from where-expressions 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
 ]

diff --git a/...les/gob-examine-student/source/__tests__/__snapshots__/collect-taken-courses.test.js.snap b/...les/gob-examine-student/source/__tests__/__snapshots__/collect-taken-courses.test.js.snap
@@ -3,48 +3,31 @@
 exports[`collectTakenCourses can go down many layers deep 1`] = `
 Array [
   Object {
-    "department": Array [
-      "CSCI",
-    ],
+    "department": "CSCI",
     "number": 121,
   },
   Object {
-    "department": Array [
-      "ART",
-      "ASIAN",
-    ],
+    "department": "AR/AS",
     "number": 170,
   },
   Object {
-    "department": Array [
-      "ART",
-      "ASIAN",
-    ],
+    "department": "AR/AS",
     "number": 175,
   },
   Object {
-    "department": Array [
-      "ART",
-      "ASIAN",
-    ],
+    "department": "AR/AS",
     "number": 190,
   },
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 210,
   },
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 215,
   },
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 220,
   },
 ]
@@ -53,9 +36,7 @@ Array [
 exports[`collectTakenCourses can go down one layer deep 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 120,
   },
 ]
@@ -64,9 +45,7 @@ Array [
 exports[`collectTakenCourses collects a list of all of the courses anywhere in this object which have the \`_taken\` property. 1`] = `
 Array [
   Object {
-    "department": Array [
-      "ASIAN",
-    ],
+    "department": "ASIAN",
     "number": 120,
   },
 ]