tests and more improvements

btford · May 8, 2012 · eb0b6e5 · eb0b6e5
1 parent 3c5cdb2
commit eb0b6e5
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 76 deletions.
diff --git a/app/css/app.css b/app/css/app.css
@@ -1,5 +1,9 @@
 /* app css stylesheet */
 
+div {
+  font-size: 30px;
+}
+
 .menu {
   list-style: none;
   border-bottom: 0.1em solid black;

diff --git a/app/index.html b/app/index.html
@@ -11,10 +11,13 @@
 <body ng-controller="GameCtrl">
   <div>Pairs left to match: {{game.unmatchedPairs}}</div>
   <div>Matching: {{game.firstPick.title}}</div>
+
   <table>
     <tr ng-repeat="row in game.grid">
       <td ng-repeat="tile in row">
-        <div ng-click="game.flipTile(tile)"><img ng-src="img/{{tile.imgName()}}.png"</div>
+        <div ng-click="game.flipTile(tile)">
+          <img ng-src="img/{{tile.imgName()}}.png">
+        </div>
       </td>
     </tr>
   </table>

diff --git a/test/unit/appSpec.js b/test/unit/appSpec.js
@@ -0,0 +1,36 @@
+/* jasmine specs for controllers go here */
+
+describe('MemoryGameApp', function() {
+
+  beforeEach(module('memoryGameApp'));
+
+
+  describe('GameCtrl', function(){
+    var gameCtrl, scope;
+
+    beforeEach(inject(function($controller, $rootScope){
+      scope = $rootScope.$new();
+      gameCtrl = $controller('GameCtrl', {$scope: scope});
+    }));
+
+
+    it('should publish the game model', function() {
+      expect(scope.game).toBeDefined();
+    });
+  });
+
+
+  describe('game', function(){
+    var game;
+
+
+    beforeEach(inject(function(_game_){
+      game = _game_;
+    }));
+
+
+    it('should create a game with 8 tile pairs', function() {
+      expect(game.unmatchedPairs).toBe(8);
+    });
+  });
+});
diff --git a/test/unit/controllersSpec.js b/test/unit/controllersSpec.js
diff --git a/test/unit/directivesSpec.js b/test/unit/directivesSpec.js
diff --git a/test/unit/filtersSpec.js b/test/unit/filtersSpec.js
diff --git a/test/unit/gameSpec.js b/test/unit/gameSpec.js
@@ -0,0 +1,42 @@
+describe('Game', function() {
+
+  var tileNames = ['turtle', 'hammer'],
+      game;
+
+  beforeEach(function() {
+    game = new Game(tileNames);
+  });
+
+
+  describe('init', function() {
+    it('should create a 2x2 grid', function() {
+      expect(game.grid.length).toBe(2);
+      expect(game.grid[0].length).toBe(2);
+      expect(game.grid[1].length).toBe(2);
+    });
+
+
+    it('should initialize unmatchedPairs and message', function() {
+      expect(game.message).toBe('Click on a tile.');
+      expect(game.unmatchedPairs).toBe(2);
+    });
+  });
+
+
+  describe('flip', function() {
+    it('should set the flipped flag on the tile being flipped', function() {
+      var tile = game.grid[0][0];
+      expect(tile.flipped).toBe(false);
+      game.flipTile(tile);
+      expect(tile.flipped).toBe(true);
+    });
+
+    it('should update the image name when a tile is flipped', function() {
+      var tile = game.grid[0][0];
+      expect(tile.imgName()).toBe('back');
+
+      game.flipTile(tile);
+      expect(tile.imgName()).not.toBe('back');
+    });
+  });
+});
diff --git a/test/unit/servicesSpec.js b/test/unit/servicesSpec.js