lib/micronaut/behaviour.rb in spicycode-micronaut-0.2.1.3 vs lib/micronaut/behaviour.rb in spicycode-micronaut-0.2.1.4

- old
+ new

@@ -75,14 +75,15 @@ def self.examples_to_run @_examples_to_run ||= [] end def self.set_it_up(*args) - @metadata = { :behaviour => {} } + @metadata = { } extra_metadata = args.last.is_a?(Hash) ? args.pop : {} extra_metadata.delete(:behaviour) # Remove it when present to prevent it clobbering the one we setup - + @metadata.update(self.superclass.metadata) + @metadata[:behaviour] = {} @metadata[:behaviour][:describes] = args.shift unless args.first.is_a?(String) @metadata[:behaviour][:describes] ||= self.superclass.metadata && self.superclass.metadata[:behaviour][:describes] @metadata[:behaviour][:description] = args.shift || '' @metadata[:behaviour][:name] = "#{describes} #{description}".strip @metadata[:behaviour][:block] = extra_metadata.delete(:behaviour_block) @@ -219,6 +220,6 @@ def self.to_s self == Micronaut::Behaviour ? 'Micronaut::Behaviour' : name end end -end \ No newline at end of file +end