summaryrefslogtreecommitdiffstats
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2012-01-03 16:27:17 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2012-01-03 16:27:17 +0100
commit2d436f39dfa9e83aac07920875241fad44af2a74 (patch)
treeaf74ad39979a7251c7fe069169b3857843379834 /spec/spec_helper.rb
parent7b9bb83a925a9df103de4eb533872ead7f45bb29 (diff)
downloadzorglub-2d436f39dfa9e83aac07920875241fad44af2a74.zip
zorglub-2d436f39dfa9e83aac07920875241fad44af2a74.tar.gz
spec: merge SpecNode within Node1
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb24
1 files changed, 10 insertions, 14 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0a36182..3ca9523 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -16,18 +16,6 @@ Zorglub::Config.register_engine 'spec-engine-2', 'spec', ENGINE_PROC
#
Zorglub::Config.engine = 'haml'
#
-class SpecNode < Zorglub::Node
- @count=0
- class << self
- attr_accessor :count
- end
- before_all do |node|
- SpecNode.count +=1
- end
- layout 'spec-layout-1'
- engine 'spec-engine-1'
-end
-#
class Temp < Zorglub::Node
end
#
@@ -38,8 +26,16 @@ class Node0 < Zorglub::Node
end
end
#
-class Node1 < SpecNode
- # overridded
+class Node1 < Zorglub::Node
+ @count=0
+ class << self
+ attr_accessor :count
+ end
+ before_all do |node|
+ Node1.count +=1
+ end
+ layout 'spec-layout-1'
+ engine 'spec-engine-1'
end
#
class Node2 < Zorglub::Node