summaryrefslogtreecommitdiffstats
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2013-01-08 09:17:10 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2013-01-08 09:17:10 +0100
commitd59521f3bec769dfe35f1d822617998468f78d7d (patch)
treead0bd822bb883c1d48556cb3c9b8059f676b2a8b /spec/spec_helper.rb
parent8b5ac512744905424c191ea56124a0e7b9f1f787 (diff)
downloadzorglub-d59521f3bec769dfe35f1d822617998468f78d7d.zip
zorglub-d59521f3bec769dfe35f1d822617998468f78d7d.tar.gz
inherited_vars in cli_vals, fix and comment
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb19
1 files changed, 10 insertions, 9 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e710967..9369519 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -122,24 +122,25 @@ end
#
class Node4 < Zorglub::Node
no_layout!
- inherited_var :js,'js0'
- inherited_var :js,'js1'
+ cli_val :js,'js0'
+ cli_val :js,'js1'
def index
- inherited_var(:js).to_yaml
+ cli_val(:js).to_yaml
end
def more
- inherited_var(:js,'js2').to_yaml
+ cli_val :js,'js2'
+ cli_val(:js).to_yaml
end
end
#
class Node5 < Node4
- inherited_var :js, 'js3'
- inherited_var :css, 'css0', 'css1'
+ cli_val :js, 'js3'
+ cli_val :css, 'css0', 'css1'
# no_layout! inherited from Node4
def index
- js = inherited_var(:js,'jsx')
- inherited_var(:css, 'css0', 'css1','css2')
- css = inherited_var :css
+ js = cli_val(:js,'jsx')
+ cli_val(:css, 'css0', 'css1','css2')
+ css = cli_val :css
js.concat(css).to_yaml
end
end