Tests for DAL.

okfn · Aug 5, 2015 · 099b7ba · 099b7ba
1 parent 4258d09
commit 099b7ba
Show file tree

Hide file tree

Showing 2 changed files with 244 additions and 29 deletions.
diff --git a/fixtures/entry.js b/fixtures/entry.js
@@ -20,18 +20,38 @@ function answers() { return {
 function bySite(fixtures, siteId) { return _.filter(fixtures, function(D) { return D.data.site === siteId }); }
 
 var objects = [
+  {
+    model: 'Entry',
+    data: {
+      id: uuid.v4(),
+      site: 'site1',
+      year: 2014,
+      place: 'place12',
+      dataset: 'dataset11',
+      answers: answers(),
+      submissionNotes: '',
+      reviewed: true,
+      reviewResult: true,
+      reviewComments: '',
+      details: 'This is site1 entry',
+      isCurrent: true, // Need to be sure that at least one current Entry exists for proper testing
+      submitter_id: _.sample(users).data.id,
+      reviewer_id: _.sample(users).data.id
+    }
+  },
+
   {
     model: 'Entry',
     data: {
       id: uuid.v4(),
       site: 'site1',
       year: 2015,
-      place: _.sample(bySite(places, 'site1')).data.id,
-      dataset: _.sample(bySite(datasets, 'site1')).data.id,
+      place: 'place11',
+      dataset: 'dataset11',
       answers: answers(),
       submissionNotes: '',
       reviewed: true,
-      reviewResult: false,
+      reviewResult: true,
       reviewComments: '',
       details: 'This is site1 entry',
       isCurrent: true, // Need to be sure that at least one current Entry exists for proper testing
@@ -46,8 +66,8 @@ var objects = [
       id: uuid.v4(),
       site: 'site1',
       year: 2015,
-      place: _.sample(bySite(places, 'site1')).data.id,
-      dataset: _.sample(bySite(datasets, 'site1')).data.id,
+      place: 'place12',
+      dataset: 'dataset11',
       answers: answers(),
       submissionNotes: '',
       reviewed: true,
@@ -59,67 +79,86 @@ var objects = [
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
       id: uuid.v4(),
       site: 'site1',
       year: 2015,
-      place: _.sample(bySite(places, 'site1')).data.id,
-      dataset: _.sample(bySite(datasets, 'site1')).data.id,
+      place: 'place11',
+      dataset: 'dataset12',
       answers: answers(),
       submissionNotes: '',
       reviewed: true,
+      reviewResult: true,
+      reviewComments: '',
+      details: '',
+      isCurrent: true,
+      submitter_id: _.sample(users).data.id,
+      reviewer_id: _.sample(users).data.id
+    }
+  },
+  {
+    model: 'Entry',
+    data: {
+      id: uuid.v4(),
+      site: 'site1',
+      year: 2015,
+      place: 'place11',
+      dataset: 'dataset12',
+      answers: answers(),
+      submissionNotes: '',
+      reviewed: false,
       reviewResult: false,
       reviewComments: '',
       details: '',
-      isCurrent: _.sample([false, true]),
+      isCurrent: false,
       submitter_id: _.sample(users).data.id,
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
       id: uuid.v4(),
       site: 'site1',
       year: 2015,
-      place: _.sample(bySite(places, 'site1')).data.id,
-      dataset: _.sample(bySite(datasets, 'site1')).data.id,
+      place: 'place12',
+      dataset: 'dataset12',
       answers: answers(),
       submissionNotes: '',
-      reviewed: true,
+      reviewed: false,
       reviewResult: false,
       reviewComments: '',
       details: '',
-      isCurrent: _.sample([false, true]),
+      isCurrent: false,
       submitter_id: _.sample(users).data.id,
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
       id: uuid.v4(),
       site: 'site1',
       year: 2015,
-      place: _.sample(bySite(places, 'site1')).data.id,
-      dataset: _.sample(bySite(datasets, 'site1')).data.id,
+      place: 'place11',
+      dataset: 'dataset11',
       answers: answers(),
       submissionNotes: '',
-      reviewed: true,
+      reviewed: false,
       reviewResult: false,
       reviewComments: '',
       details: '',
-      isCurrent: _.sample([false, true]),
+      isCurrent: false,
       submitter_id: _.sample(users).data.id,
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
@@ -139,7 +178,7 @@ var objects = [
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
@@ -159,7 +198,7 @@ var objects = [
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
@@ -179,7 +218,7 @@ var objects = [
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
@@ -199,7 +238,7 @@ var objects = [
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   {
     model: 'Entry',
     data: {
@@ -219,7 +258,7 @@ var objects = [
       reviewer_id: _.sample(users).data.id
     }
   },
-  
+
   // A set of entries for pair of place-dataset which all have isCurrent === false
   {
     model: 'Entry',