spec: update Node class names and usage

2 files changed, 48 insertions, 48 deletions

diff --git a/spec/node_spec.rb b/spec/node_spec.rb
index fad2a45..ae18a05 100644
--- a/spec/node_spec.rb
+++ b/spec/node_spec.rb
@@ -16,21 +16,21 @@ describe Zorglub do
         end
         #
         it "engine should return class defined Node's engine" do
-            Node1.engine.should == "spec-engine-1"
-            Node2.engine.should == "spec-engine-2"
+            Node1.engine.should == "engine-1"
+            Node3.engine.should == "engine-2"
         end
         #
         it "layout should return class defined Node's layout" do
-            Node1.layout.should == "spec-layout-1"
-            Node2.layout.should == "spec-layout-2"
+            Node1.layout.should == "layout-1"
+            Node3.layout.should == "layout-2"
         end
         #
         it "engine should return engine inherited from Node2" do
-            Node3.engine.should == "spec-engine-2"
+            Node2.engine.should == "engine-1"
         end
         #
         it "layout should return layout inherited from Node2" do
-            Node3.layout.should == "spec-layout-2"
+            Node2.layout.should == "layout-1"
         end
         #
         it "r should build a well formed path" do
@@ -39,7 +39,7 @@ describe Zorglub do
         #
         it "should return err404 response when no method found" do
             Node0.respond_to?('noresponse').should be_false
-            r = Node2.call( {'PATH_INFO'=>'/noresponse'} )
+            r = Node0.call( {'PATH_INFO'=>'/noresponse'} )
             r.status.should == 404
         end
         #
@@ -72,38 +72,38 @@ describe Zorglub do
         end
         #
         it "layout proc, method level layout and engine definitions should work" do
-            r = Node2.call( {'PATH_INFO'=>'/index'} )
+            r = Node1.call( {'PATH_INFO'=>'/index'} )
             r.status.should == 200
             h = YAML.load r.body[0]
             ly = File.join Zorglub::Config.root, Zorglub::Config.layout_dir, 'main.spec'
-            vu = File.join Zorglub::Config.root, Zorglub::Config.view_dir, Node2.r, 'index.spec'
+            vu = File.join Zorglub::Config.root, Zorglub::Config.view_dir, Node1.r, 'index.spec'
             h[:path].should == ly
             h[:layout].should == ly
             h[:view].should == vu
         end
         #
         it "before_all hook should work" do
-            Node1.before = 0
-            Node1.after = 0
-            Node1.before.should == 0
-            Node1.call( {'PATH_INFO'=>'/index'} )
-            Node1.before.should == 1
-            Node1.call( {'PATH_INFO'=>'/index'} )
-            Node1.before.should == 2
-            Node1.call( {'PATH_INFO'=>'/index'} )
-            Node1.before.should == 3
+            Node3.before = 0
+            Node3.after = 0
+            Node3.before.should == 0
+            Node3.call( {'PATH_INFO'=>'/index'} )
+            Node3.before.should == 1
+            Node3.call( {'PATH_INFO'=>'/index'} )
+            Node3.before.should == 2
+            Node3.call( {'PATH_INFO'=>'/index'} )
+            Node3.before.should == 3
         end
         #
         it "after_all hook should work" do
-            Node1.before = 0
-            Node1.after = 0
-            Node1.after.should == 0
-            Node1.call( {'PATH_INFO'=>'/index'} )
-            Node1.after.should == 1
-            Node1.call( {'PATH_INFO'=>'/index'} )
-            Node1.after.should == 2
-            Node1.call( {'PATH_INFO'=>'/index'} )
-            Node1.after.should == 3
+            Node3.before = 0
+            Node3.after = 0
+            Node3.after.should == 0
+            Node3.call( {'PATH_INFO'=>'/index'} )
+            Node3.after.should == 1
+            Node3.call( {'PATH_INFO'=>'/index'} )
+            Node3.after.should == 2
+            Node3.call( {'PATH_INFO'=>'/index'} )
+            Node3.after.should == 3
         end
     end
     #
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6dc4275..faf5cc3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,10 +12,10 @@ require 'yaml'
 #
 require 'zorglub'
 #
-ENGINE_PROC = Proc.new { |path,obj| {:path=>path,:layout=>obj.layout,:view=>obj.view,:args=>obj.args}.to_yaml }
-Zorglub::Config.register_engine 'default', nil, ENGINE_PROC
-Zorglub::Config.register_engine 'spec-engine-1', 'spec', ENGINE_PROC
-Zorglub::Config.register_engine 'spec-engine-2', 'spec', ENGINE_PROC
+HASH_PROC = Proc.new { |path,obj| {:path=>path,:layout=>obj.layout,:view=>obj.view,:args=>obj.args}.to_yaml }
+Zorglub::Config.register_engine 'default', nil, HASH_PROC
+Zorglub::Config.register_engine 'engine-1', 'spec', HASH_PROC
+Zorglub::Config.register_engine 'engine-2', 'spec', HASH_PROC
 #
 Zorglub::Config[:engine] = 'default'
 Zorglub::Config.root = File.join Dir.pwd, 'spec', 'data'
@@ -37,37 +37,37 @@ class Node0 < Zorglub::Node
 end
 #
 class Node1 < Zorglub::Node
+    layout 'layout-1'
+    engine 'engine-1'
+    def index
+        layout 'main'
+        engine 'engine-2'
+    end
+end
+#
+class Node2 < Node1
+    # inherited from Node1
+end
+#
+class Node3 < Zorglub::Node
     @before=0
     @after=0
     class << self
         attr_accessor :before, :after
     end
     before_all do |node|
-        Node1.before +=1
+        Node3.before +=1
     end
     after_all do |node|
-        Node1.after +=1
+        Node3.after +=1
     end
-    layout 'spec-layout-1'
-    engine 'spec-engine-1'
+    layout 'layout-2'
+    engine 'engine-2'
     def index
         (self.class.before-self.class.after).should == 1
     end
 end
 #
-class Node2 < Zorglub::Node
-    layout 'spec-layout-2'
-    engine 'spec-engine-2'
-    def index
-        layout 'main'
-        engine 'spec-engine-1'
-    end
-end
-#
-class Node3 < Node2
-    # inherited from Node2
-end
-#
 APP = Zorglub::App.new do
     map '/spec0', Node0
     map '/spec1', Node1