Fixed Jasmine tests

Gemfile

@@ -2,14 +2,13 @@ source 'https://rubygems.org'
 
 ruby '2.1.1'
 
+gem 'rails', '4.1.0'
+
 #Dokku demands this one.
 gem 'rails_12factor'
 
 gem 'ng-rails-csrf'
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.0'
-
 gem 'mongoid', '~> 4.0.0.beta1', github: 'mongoid/mongoid'
 
 gem 'sass-rails'

Gemfile.lock

@@ -1,16 +1,16 @@
 GIT
   remote: git://github.com/mongoid/mongoid.git
-  revision: e93a4837b0266db46c24aae172e184f57c847b04
+  revision: 50b633c8baf2fa467e8c36b18a013a2cd50e0454
   specs:
-    mongoid (4.0.0.beta1)
-      activemodel (>= 4.0.0)
-      moped (~> 2.0.beta6)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
 
 GIT
   remote: git://github.com/plataformatec/devise.git
-  revision: 6129215afecc0b3628e0d46f5253f89e2a862c6b
+  revision: b6af1675d5b4123b2481dd2630fe5197829994ec
   specs:
     devise (3.2.4)
       bcrypt (~> 3.0)
@@ -53,11 +53,11 @@ GEM
     arrayfields (4.9.2)
     awesome_print (1.2.0)
     bcrypt (3.1.7)
-    bson (2.2.3)
+    bson (2.3.0)
     builder (3.2.2)
     cane (2.6.2)
       parallel
-    capybara (2.2.1)
+    capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -86,9 +86,9 @@ GEM
     colored (1.2)
     connection_pool (2.0.0)
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.2.0)
     factory_girl (4.4.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.4.1)
@@ -100,17 +100,17 @@ GEM
     figaro (0.7.0)
       bundler (~> 1.0)
       rails (>= 3, < 5)
-    flay (2.4.0)
+    flay (2.5.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flog (4.2.0)
+    flog (4.2.1)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.4)
     haml (4.0.5)
       tilt
     high_voltage (2.1.0)
     hike (1.2.3)
-    hirb (0.7.1)
+    hirb (0.7.2)
     i18n (0.6.9)
     jasmine-core (2.0.0)
     jasmine-rails (0.9.0)
@@ -133,7 +133,7 @@ GEM
       chronic (>= 0.6.2)
       fattr (>= 2.2.0)
       map (>= 5.1.0)
-    map (6.5.3)
+    map (6.5.4)
     method_source (0.8.2)
     metric_fu (4.11.1)
       cane (~> 2.5, >= 2.5.2)
@@ -151,25 +151,25 @@ GEM
       roodi (~> 3.1)
     metric_fu-Saikuro (1.1.3)
     mime-types (1.25.1)
-    mini_portile (0.5.3)
-    minitest (5.3.3)
-    moped (2.0.0.rc1)
+    mini_portile (0.6.0)
+    minitest (5.3.5)
+    moped (2.0.0)
       bson (~> 2.2)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     ng-rails-csrf (0.1.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
     optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
     parallel (1.0.0)
     phantomjs (1.9.7.1)
-    polyglot (0.3.4)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    polyglot (0.3.5)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -205,7 +205,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
     redcard (1.1.0)
@@ -219,22 +219,26 @@ GEM
       mime-types (>= 1.16)
     roodi (3.3.1)
       ruby_parser (~> 3.2, >= 3.2.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.1)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
     ruby-progressbar (1.5.1)
     ruby2ruby (2.0.8)
       ruby_parser (~> 3.1)
@@ -267,14 +271,14 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
-    uglifier (2.5.0)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warden (1.2.3)

spec/javascripts/example_spec.coffee

@@ -0,0 +1,15 @@
+#= require application
+#= require angular/angular-mock
+
+describe "Restauranteur controllers", ->
+  beforeEach ->
+    module("FarmBot")
+    inject ($controller) ->
+      @scope = {}
+      @ctrl = $controller("OverviewController", $scope: scope)
+
+  describe "OverviewController", ->
+    it "initializes X, Y and Z", ->
+      expect(scope.x).toBe(0)
+      expect(scope.y).toBe(0)
+      expect(scope.z).toBe(0)

spec/javascripts/example_spec.js

@@ -1,19 +0,0 @@
-//= require application
-//= require angular/angular-mock
-describe('FarmBot', function () {
-  var scope, controller;
-
-  beforeEach(function () {
-    module('FarmBot');
-    inject(function ($rootScope, $controller) {
-        scope = $rootScope.$new();
-        controller = $controller('OverviewController', {
-            '$scope': scope
-        });
-    });
-})
-
-    it('does stuff', function () {
-        expect(2 + 2).toBe(4);
-    });
-});