Fix coursesHelper tests, improve fixture specificity

test/app/fixtures/campaigns.coffee

@@ -1,5 +1,5 @@
-Campaign = require 'models/Campaign';
-Campaigns = require 'collections/Campaigns';
+Campaign = require 'models/Campaign'
+Campaigns = require 'collections/Campaigns'
 
 module.exports = new Campaigns([
   new Campaign({

test/app/fixtures/classrooms.coffee

@@ -1,40 +0,0 @@
-Classroom = require 'models/Classroom';
-Classrooms = require 'collections/Classrooms';
-
-module.exports = new Classrooms([
-  {
-    _id: "classroom0",
-    name: "Teacher Zero's Other Classroom"
-    ownerID: "teacher0",
-    aceConfig:
-      language: 'python'
-    members: []
-  }
-
-  {
-    _id: "classroom1",
-    name: "Teacher Zero's Classroomiest Classroom"
-    members: [
-      "student0",
-      "student1",
-      "student2",
-      "student3",
-    ],
-    ownerID: "teacher0",
-    aceConfig:
-      language: 'python'
-  }
-  
-  {
-    _id: "classroom_archived",
-    name: "Teacher Zero's Archived Classroom"
-    members: [
-      "student0",
-      "student4",
-    ],
-    ownerID: "teacher0",
-    aceConfig:
-      language: 'python'
-    archived: true
-  }
-])

test/app/fixtures/classrooms/active-classroom.coffee

@@ -0,0 +1,17 @@
+Classroom = require 'models/Classroom'
+
+module.exports = new Classroom(
+  {
+    _id: "active-classroom",
+    name: "Teacher Zero's Classroomiest Classroom"
+    members: [
+      "student0",
+      "student1",
+      "student2",
+      "student3",
+    ],
+    ownerID: "teacher0",
+    aceConfig:
+      language: 'python'
+  }
+)

test/app/fixtures/classrooms/archived-classroom.coffee

@@ -0,0 +1,16 @@
+Classroom = require 'models/Classroom'
+
+module.exports = new Classroom(
+  {
+    _id: "classroom_archived",
+    name: "Teacher Zero's Archived Classroom"
+    members: [
+      "student0",
+      "student3",
+    ],
+    ownerID: "teacher0",
+    aceConfig:
+      language: 'python'
+    archived: true
+  }
+)

test/app/fixtures/classrooms/classrooms.coffee

@@ -0,0 +1,8 @@
+Classroom = require 'models/Classroom'
+Classrooms = require 'collections/Classrooms'
+
+module.exports = new Classrooms([
+  require './active-classroom'
+  require './empty-classroom'
+  require './archived-classroom'
+])

test/app/fixtures/classrooms/empty-classroom.coffee

@@ -0,0 +1,12 @@
+Classroom = require 'models/Classroom'
+
+module.exports = new Classroom(
+  {
+    _id: "classroom0",
+    name: "Teacher Zero's Other Classroom"
+    ownerID: "teacher0",
+    aceConfig:
+      language: 'python'
+    members: []
+  }
+)

test/app/fixtures/classrooms/unarchived-classrooms.coffee

@@ -0,0 +1,7 @@
+Classroom = require 'models/Classroom'
+Classrooms = require 'collections/Classrooms'
+
+module.exports = new Classrooms([
+  require './active-classroom'
+  require './empty-classroom'
+])

test/app/fixtures/course-instances.coffee

@@ -1,9 +1,9 @@
-CourseInstances = require 'collections/CourseInstances';
+CourseInstances = require 'collections/CourseInstances'
 
 module .exports = new CourseInstances([
   {
     _id: "instance0"
-    courseID: "course0", 
-    classroomID: "classroom0"
+    courseID: "course0",
+    classroomID: "active-classroom"
   },
 ])

test/app/fixtures/courses.coffee

@@ -1,4 +1,4 @@
-Courses = require 'collections/Courses';
+Courses = require 'collections/Courses'
 
 module.exports = new Courses(
   [

test/app/fixtures/prepaids.coffee

@@ -1,4 +1,4 @@
-Prepaids = require 'collections/Prepaids';
+Prepaids = require 'collections/Prepaids'
 
 module.exports = new Prepaids([
   {

test/app/fixtures/students.coffee

@@ -1,4 +1,4 @@
-Users = require 'collections/Users';
+Users = require 'collections/Users'
 
 module.exports = new Users(
   [
@@ -21,20 +21,5 @@ module.exports = new Users(
       _id: "student3"
       name: "Student Three"
     }
-    
-    {
-      _id: "student4"
-      name: "Student Four"
-    }
-    
-    {
-      _id: "student5"
-      name: "Student Five"
-    }
-    
-    {
-      _id: "student6"
-      name: "Student Six"
-    }
   ]
 )

test/app/fixtures/teacher.coffee

@@ -1,4 +1,4 @@
-User = require 'models/User';
+User = require 'models/User'
 
 module.exports = new User(
   {

test/app/lib/CoursesHelper.spec.coffee

@@ -6,14 +6,14 @@ CourseInstances = require 'collections/CourseInstances'
 Classrooms = require 'collections/Classrooms'
 
 # These got broken by changes to fixtures :(
-xdescribe 'CoursesHelper', ->
+describe 'CoursesHelper', ->
 
   describe 'calculateAllProgress', ->
 
     beforeEach ->
       # classrooms, courses, campaigns, courseInstances, students
-      @classrooms = require 'test/app/fixtures/classrooms'
-      @classroom = @classrooms.models[0]
+      @classroom = require 'test/app/fixtures/classrooms/active-classroom'
+      @classrooms = new Classrooms([ @classroom ])
       @courses = require 'test/app/fixtures/courses'
       @course = @courses.models[0]
       @campaigns = require 'test/app/fixtures/campaigns'