jax 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,3 +1,56 @@
+* 2.0.1 *
+
+* Implemented missing `Jax.Geometry.Line#contains` method.
+
+* Fixed line intersection test, when `vec3` is used as a receiver for point of intersection.
+
+* Built-in resources have been moved to their respective `.resource` files. Same with
+  shaders. This should make overriding them work more reliably, and remove redundant
+  requests for built-in shaders and resources.
+
+
+
+* 2.0.0 *
+
+* Integrates cleanly with Ruby on Rails applications. Add `jax` to the bundle, then run:
+    jax g install
+
+* Internal development server is now a Rails engine, so that it can run stand-alone (for
+  non-Rails apps) as well as be mounted into Rails apps directly.
+  
+* Generators now inherit from `Rails::Generators::Base`
+
+* CoffeeScript is now supported, and CS files will be generated by default if the CS gem
+  is present.
+
+* Files are now created in `app/assets/jax/` instead of just `app/` in order to gain the
+  benefits of the Rails asset pipeline.
+  
+* The `jax package` command has been deprecated in favor of `rake assets:precompile`.
+
+* Packager will now minify all JavaScript code, if possible.
+
+* The `public/javascripts/jax.js` file has been deprecated. Jax source files are now served
+  directly from within the rubygem.
+  
+* The `rake jax:update` task has been removed. It is no longer needed.
+
+* Removed `config/routes.rb` from non-Rails apps. Instead, controllers map themselves
+  automatically on the JS side when defined, and their actions are looked up dynamically.
+
+* Controller generator now generates an `index` action by default.
+  
+* Helper files are no longer generated by the controller generator since they usually weren't
+  tightly coupled to their corresponding controllers. A helper generator has been added,
+  instead.
+  
+* Added a material viewer to the dev suite, so that materials can be previewed in isolation
+
+* Removed a runtime dependency on Minitar. `Gem::Package` is now used for tar and untar
+  operations instead.
+
+
+
 * 1.1.1 *
 
 * Mouse events are scaled in relation to the real canvas size, regardless of CSS styling.

data/lib/assets/javascripts/jax/builtin/all.js

@@ -5,17 +5,3 @@
 //= require "jax/builtin/meshes/plane"
 //= require "jax/builtin/meshes/sphere"
 //= require "jax/builtin/meshes/teapot"
-
-//= require "shaders/texture/material"
-//= require "shaders/normal_map/material"
-//= require "shaders/shadow_map/material"
-//= require "shaders/depthmap/material"
-//= require "shaders/paraboloid/material"
-//= require "shaders/fog/material"
-//= require "shaders/picking/material"
-
-Jax.Material.create("basic");
-Jax.Material.create("default", {default_shader:'basic'});
-Jax.Material.create("depthmap", {default_shader:"depthmap"});
-Jax.Material.create("paraboloid-depthmap", {type:"Paraboloid",default_shader:"paraboloid",layers:[{type:"Depthmap"}]});
-Jax.Material.create("picking", {type:"Picking"});

data/lib/assets/javascripts/jax/geometry/line.js

@@ -3,6 +3,8 @@
  *
  **/
 Jax.Geometry.Line = (function() {
+  var bufs = {};
+  
   var Line = Jax.Class.create({
     /**
      * new Jax.Geometry.Line([a[, b]])
@@ -65,15 +67,40 @@ Jax.Geometry.Line = (function() {
       return this;
     },
     
+    /**
+     * Jax.Geometry.Line#contains(point) -> Boolean
+     * - point (vec3): a 3D point
+     *
+     * Tests and returns whether this line contains the specified point.
+     **/
+    contains: function(point) {
+      // check whether the normal from A to B is the same as the normal from A to P,
+      // and whether the normal from B to A is the same as the normal from B to P.
+      // There's probably a more efficient way to do this...
+      
+      var ba = vec3.subtract(this.b, this.a, bufs.ba || (bufs.ba = vec3.create()));
+      var pa = vec3.subtract(point,  this.a, bufs.ba || (bufs.pa = vec3.create()));
+      var ab = vec3.subtract(this.a, this.b, bufs.ba || (bufs.ab = vec3.create()));
+      var pb = vec3.subtract(point,  this.b, bufs.ba || (bufs.pb = vec3.create()));
+      
+      vec3.normalize(ba);
+      vec3.normalize(pa);
+      vec3.normalize(ab);
+      vec3.normalize(pb);
+      
+      return Math.equalish(ba, pa) && Math.equalish(ab, pb);
+    },
+    
     /**
      * Jax.Geometry.Line#intersectLineSegment(line[, dest]) -> Boolean
      * - line (Jax.Geometry.Line): the line to test for intersection
-     * - dest (Jax.Geometry.Line): an optional receiving line
+     * - dest (Jax.Geometry.Line | vec3): an optional receiver
      *
      * Tests the two lines for intersection. If +dest+ is given, the overlap is stored
      * within it. (If the lines intersect at a single point, but do not overlap, then
      * only the A point in +dest+ will be set.) If +dest+ is
-     * omitted, this information is ignored.
+     * omitted, this information is ignored. If +dest+ is a vec3, it will hold the center
+     * of the intersection line.
      *
      * If the lines do not interesct, Jax.Geometry.DISJOINT (which is equal to 0) is returned.
      * If they intersect in a single unique point, Jax.Geometry.INTERSECT is returned.
@@ -84,6 +111,7 @@ Jax.Geometry.Line = (function() {
       var v = vec3.subtract(line.b, line.a, vec3.create());
       var w = vec3.subtract(this.a, line.a, vec3.create());
       var D = (u[0] * v[1] - u[1] * v[0]);
+      var isVec3 = dest && !(dest instanceof Jax.Geometry.Line);
       if (Math.abs(D) < Math.EPSILON) { // S1 and S2 are parallel
         if ((u[0] * w[1] - u[1] * w[0]) != 0 || (v[0] * w[1] - v[1] * w[0]) != 0) {
           return Jax.Geometry.DISJOINT; // they are NOT colinear
@@ -96,21 +124,27 @@ Jax.Geometry.Line = (function() {
           if (!Math.equalish(this.a, line.a)) // they are distinct points
             return Jax.Geometry.DISJOINT;
           // they are the same point
-          if (dest) vec3.set(line.a, dest.a);
+          if (dest)
+            if (isVec3) vec3.set(line.a, dest);
+            else vec3.set(line.a, dest.a);
           // vec3.set(line.a, dest.b);
           return Jax.Geometry.INTERSECT;
         }
         if (du == 0) { // +this+ is a single point
           if (!line.contains(this.a)) // but is not in S2
             return Jax.Geometry.DISJOINT;
-          if (dest) vec3.set(this.a, dest.a);
+          if (dest)
+            if (isVec3) vec3.set(this.a, dest);
+            else vec3.set(this.a, dest.a);
           // vec3.set(this.b, dest.b);
           return Jax.Geometry.INTERSECT;
         }
         if (dv == 0) { // +line+ is a single point
           if (!this.contains(line.a)) // but is not in this line
             return Jax.Geometry.DISJOINT;
-          if (dest) vec3.set(line.a, dest.a);
+          if (dest)
+            if (isVec3) vec3.set(line.a, dest);
+            else vec3.set(line.a, dest.a);
           // vec3.set(line.b, dest.b);
           return Jax.Geometry.INTERSECT;
         }
@@ -134,15 +168,25 @@ Jax.Geometry.Line = (function() {
         if (t0 == t1) {
           // intersect is a point
           if (line) {
-            vec3.add(line.a, vec3.scale(v, t0, dest.a), dest.a);
+            if (dest) {
+              var dest_a = isVec3 ? dest : dest.a;
+              vec3.add(line.a, vec3.scale(v, t0, dest_a), dest_a);
+            }
             return Jax.Geometry.INTERSECT;
           }
         }
           
         // they overlap in a valid subsegment
         if (dest) {
-          vec3.add(line.a, vec3.scale(v, t0, dest.a), dest);
-          vec3.add(line.b, vec3.scale(v, t1, dest.b), dest);
+          if (isVec3) {
+            var tmp = bufs.tmp || (bufs.tmp = vec3.create());
+            vec3.add(line.a, vec3.scale(v, t0, dest), dest);
+            vec3.add(line.b, vec3.scale(v, t1, tmp),  dest);
+            vec3.scale(dest, 0.5, dest);
+          } else {
+            vec3.add(line.a, vec3.scale(v, t0, dest.a), dest);
+            vec3.add(line.b, vec3.scale(v, t1, dest.b), dest);
+          }
         }
         return Jax.Geometry.COINCIDENT;
       }

data/lib/assets/javascripts/resources/materials/default.resource

@@ -0,0 +1,2 @@
+layers:
+  - type: Lighting

data/lib/assets/javascripts/resources/materials/depthmap.resource

@@ -0,0 +1 @@
+type: Depthmap

data/lib/assets/javascripts/resources/materials/paraboloid-depthmap.resource

@@ -0,0 +1,4 @@
+type: Paraboloid
+
+layers:
+  - type: Depthmap

data/lib/assets/javascripts/resources/materials/picking.resource

@@ -0,0 +1 @@
+type: Picking

data/lib/jax/version.rb

@@ -2,7 +2,7 @@ module Jax
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
     STRING = BUILD ? [MAJOR, MINOR, PATCH, BUILD].join(".") : [MAJOR, MINOR, PATCH].join(".")
   end

data/spec/javascripts/jax/geometry/triangle_spec.js

@@ -25,9 +25,18 @@ describe("Jax.Geometry.Triangle", function() {
 
           expect(tri.intersectTriangle(tri2)).toBeFalsy();
         });
+        
+        it("should not raise errors", function() {
+          // TypeError: Object [Line a:[Float32Array: -0.44343942403793335,0.4999999701976776,-0.4434394836425781], b:[Float32Array: 0.5037173628807068,-0.5,0.28691262006759644]] has no method 'contains' with
+          var dist = vec3.create();
+          var tri1 = new Jax.Geometry.Triangle([0.5,0.5,0.5000000596046448], [-0.5,0.4999999701976776,-0.5000000596046448], [0.5,0.4999999701976776,-0.5000000596046448]);
+          var tri2 = new Jax.Geometry.Triangle([0.5037173628807068,0.5,0.28691262006759644], [0.5037173628807068,-0.5,0.28691262006759644], [0.8630872964859009,0.5,-0.6462825536727905]);
+          
+          expect(function() { tri1.intersectTriangle(tri2, dist); }).not.toThrow();
+        });
       });
     
-      describe("with triangle and capture point", function() {
+      describe("with triangle and capture line", function() {
         var line;
         beforeEach(function() { line = new Jax.Geometry.Line(); });
         
@@ -51,6 +60,38 @@ describe("Jax.Geometry.Triangle", function() {
         });
       });
     
+      describe("with triangle and capture vec3", function() {
+        var point;
+        beforeEach(function() { point = vec3.create(); });
+        
+        // more complete tritri tests found in tritri_spec.js
+        it("no intersect", function() {
+          var tri2 = new Jax.Geometry.Triangle([0,0.5,2],[-1,0.5,2],[0,1.5,2]);
+          expect(tri.intersectTriangle(tri2, point)).toBeFalsy();
+        });
+
+        it("intersect", function() {
+          var tri2 = new Jax.Geometry.Triangle([0,0.95,-1],[-1,0.95,2],[1,0.95,2]);
+          expect(tri.intersectTriangle(tri2, point)).toBeTruthy();
+          expect(Math.abs(point[0]) + Math.abs(point[1]) + Math.abs(point[2])).toBeGreaterThan(Math.EPSILON);
+        });
+        
+        it("identical, positioned above", function() {
+          tri = new Jax.Geometry.Triangle([0,0.95,-1],[-1,0.95,2],[1,0.95,2]);
+          var tri2 = new Jax.Geometry.Triangle([0,3.95,-1],[-1,3.95,2],[1,3.95,2]);
+
+          expect(tri.intersectTriangle(tri2, point)).toBeFalsy();
+        });
+        
+        it("identical, same position", function() {
+          tri  = new Jax.Geometry.Triangle([-0.7006292939186096,0.5,0.5090369582176208], [-0.7911535501480103,0.5,0.3522442579269409], [-0.7390738129615784,0.5877852439880371,0.32905685901641846]);
+          tri2 = new Jax.Geometry.Triangle([-0.7006292939186096,0.5,0.5090369582176208], [-0.7911535501480103,0.5,0.3522442579269409], [-0.7390738129615784,0.5877852439880371,0.32905685901641846]);
+          
+          expect(tri.intersectTriangle(tri2, point)).toBeTruthy();
+          expect(Math.abs(point[0])+Math.abs(point[1])+Math.abs(point[2])).toBeGreaterThan(Math.EPSILON);
+        });
+      });
+    
       describe("with ray", function() {
         it("intersect", function() {
           var O = [0,0,1];

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jax
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-11-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153276260 !ruby/object:Gem::Requirement
+  requirement: &2153982300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153276260
+  version_requirements: *2153982300
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153273380 !ruby/object:Gem::Requirement
+  requirement: &2153981800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *2153273380
+  version_requirements: *2153981800
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2153272800 !ruby/object:Gem::Requirement
+  requirement: &2153981180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153272800
+  version_requirements: *2153981180
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153272280 !ruby/object:Gem::Requirement
+  requirement: &2153980680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153272280
+  version_requirements: *2153980680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153271720 !ruby/object:Gem::Requirement
+  requirement: &2153980220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153271720
+  version_requirements: *2153980220
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &2153271160 !ruby/object:Gem::Requirement
+  requirement: &2153979740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153271160
+  version_requirements: *2153979740
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &2153270600 !ruby/object:Gem::Requirement
+  requirement: &2153979200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.7
   type: :development
   prerelease: false
-  version_requirements: *2153270600
+  version_requirements: *2153979200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153270020 !ruby/object:Gem::Requirement
+  requirement: &2153978700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2153270020
+  version_requirements: *2153978700
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2153269420 !ruby/object:Gem::Requirement
+  requirement: &2153978220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153269420
+  version_requirements: *2153978220
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2153268860 !ruby/object:Gem::Requirement
+  requirement: &2153977740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153268860
+  version_requirements: *2153977740
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &2153268280 !ruby/object:Gem::Requirement
+  requirement: &2153977260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *2153268280
+  version_requirements: *2153977260
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2153267700 !ruby/object:Gem::Requirement
+  requirement: &2153976780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.9.1
   type: :development
   prerelease: false
-  version_requirements: *2153267700
+  version_requirements: *2153976780
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153267140 !ruby/object:Gem::Requirement
+  requirement: &2153976320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153267140
+  version_requirements: *2153976320
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2153266700 !ruby/object:Gem::Requirement
+  requirement: &2153975940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153266700
+  version_requirements: *2153975940
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2153266040 !ruby/object:Gem::Requirement
+  requirement: &2153975400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153266040
+  version_requirements: *2153975400
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2153261800 !ruby/object:Gem::Requirement
+  requirement: &2153974840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *2153261800
+  version_requirements: *2153974840
 - !ruby/object:Gem::Dependency
   name: w3c_validators
-  requirement: &2153261320 !ruby/object:Gem::Requirement
+  requirement: &2153974180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *2153261320
+  version_requirements: *2153974180
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2153260780 !ruby/object:Gem::Requirement
+  requirement: &2153973660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 1.4.9
   type: :development
   prerelease: false
-  version_requirements: *2153260780
+  version_requirements: *2153973660
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2153260280 !ruby/object:Gem::Requirement
+  requirement: &2153973140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,7 +219,7 @@ dependencies:
         version: 2.0.11
   type: :development
   prerelease: false
-  version_requirements: *2153260280
+  version_requirements: *2153973140
 description: ! "\n    Framework for creating rich WebGL-enabled applications using
   JavaScript and Ruby.\n    Can be used stand-alone to create static JavaScript documents,
   or integrated\n    seamlessly with Ruby on Rails to build dynamic WebGL applications.\n
@@ -344,6 +344,11 @@ files:
 - lib/assets/javascripts/jax/webgl/shader_chain.js
 - lib/assets/javascripts/jax/webgl/texture.js
 - lib/assets/javascripts/jax/webgl/world.js
+- lib/assets/javascripts/resources/materials/basic.resource
+- lib/assets/javascripts/resources/materials/default.resource
+- lib/assets/javascripts/resources/materials/depthmap.resource
+- lib/assets/javascripts/resources/materials/paraboloid-depthmap.resource
+- lib/assets/javascripts/resources/materials/picking.resource
 - lib/assets/javascripts/shaders/basic/common.glsl
 - lib/assets/javascripts/shaders/basic/fragment.glsl
 - lib/assets/javascripts/shaders/basic/vertex.glsl
@@ -513,7 +518,6 @@ files:
 - spec/javascripts/shaders/preprocessor_spec.js
 - spec/javascripts/shaders/shadow_map_spec.js
 - spec/javascripts/shaders/texture_spec.js
-- spec/javascripts/suite/controller_select_spec.js.coffee
 - spec/lib/jax/commands/plugin_manager/credentials_spec.rb
 - spec/lib/jax/commands/plugin_manager/push_spec.rb
 - spec/lib/jax/commands/plugin_manager_spec.rb
@@ -640,7 +644,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3865866395311177846
+      hash: -3170321314478077500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -649,7 +653,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3865866395311177846
+      hash: -3170321314478077500
 requirements: []
 rubyforge_project: jax
 rubygems_version: 1.8.10
@@ -759,7 +763,6 @@ test_files:
 - spec/javascripts/shaders/preprocessor_spec.js
 - spec/javascripts/shaders/shadow_map_spec.js
 - spec/javascripts/shaders/texture_spec.js
-- spec/javascripts/suite/controller_select_spec.js.coffee
 - spec/lib/jax/commands/plugin_manager/credentials_spec.rb
 - spec/lib/jax/commands/plugin_manager/push_spec.rb
 - spec/lib/jax/commands/plugin_manager_spec.rb

data/spec/javascripts/suite/controller_select_spec.js.coffee

@@ -1,24 +0,0 @@
-#= require "jquery"
-#= require "jax/controller-select"
-
-describe "The select box in the dev suite runtime", ->
-  select = null
-  
-  beforeEach ->
-    Jax.routes.clear()
-    Jax.views.push 'welcome/index', -> 1
-    Jax.Controller.create "Welcome", index: -> 1
-    select = document.createElement "select"
-    _controller_select_fill select
-  
-  it "should contain the 'Welcome' controller", ->
-    expect(select.options[0].value).toEqual("welcome")
-
-  describe "clicked", ->
-    beforeEach ->
-      select.webgl_context = SPEC_CONTEXT
-      select.selectedIndex = 0
-      $(select).trigger("change");
-    
-    it "should redirect to the selected controller", ->
-      expect(SPEC_CONTEXT.current_controller.getControllerName()).toEqual("Welcome")