Commit 2a93f59

@@ -101,6 +101,13 @@ module.exports = MovieLibrary = (function(_super) {
     });
   };
 
+  MovieLibrary.prototype.find_movies_by_pixar_or_disney = function() {
+    var _this = this;
+    return this.find_all(function(movie) {
+      return movie.studio === Studio.Pixar || movie.studio === Studio.Disney;
+    });
+  };
+
   return MovieLibrary;
 
 })(Module);

@@ -2,9 +2,9 @@
 var Studio;
 
 module.exports = Studio = {
-  CastleRock: "",
-  MiramaxFilms: "",
-  RegencyEnterprises: "",
-  Pixar: "",
-  Disney: ""
+  CastleRock: "Castle Rock",
+  MiramaxFilms: "Miramax Films",
+  RegencyEnterprises: "Regency Enterprises",
+  Pixar: "Pixar",
+  Disney: "Disney"
 };

@@ -50,3 +50,6 @@ module.exports = class MovieLibrary extends Module
     @find_all (movie) =>
       movie.studio == Studio.Pixar
 
+  find_movies_by_pixar_or_disney: ->
+    @find_all (movie) =>
+      movie.studio == Studio.Pixar || movie.studio == Studio.Disney

@@ -1,7 +1,7 @@
 module.exports = Studio =
-  CastleRock: ""
-  MiramaxFilms: ""
-  RegencyEnterprises: ""
-  Pixar: ""
-  Disney: ""
+  CastleRock: "Castle Rock"
+  MiramaxFilms: "Miramax Films"
+  RegencyEnterprises: "Regency Enterprises"
+  Pixar: "Pixar"
+  Disney: "Disney"
 

@@ -55,3 +55,14 @@ describe "MovieLibrary", ->
       results.should.include(@cars)
       results.should.include(@monsters_inc)
 
+
+    it 'finds all movies published by pixar or disney', ->
+       results = @sut.find_movies_by_pixar_or_disney()
+       results.length.should.equal(7)
+       results.should.include(@toy_story)
+       results.should.include(@up)
+       results.should.include(@cars)
+       results.should.include(@monsters_inc)
+       results.should.include(@fantasia)
+       results.should.include(@dumbo)
+       results.should.include(@pinocchio)