macros4cuke 0.5.14 → 0.5.15

data/spec/macros4cuke/coll-walker-factory_spec.rb

@@ -183,57 +183,57 @@ describe CollWalkerFactory do
       [
         [:on_placeholder, 3, :name], # 0
         [:on_static_text, 3, :source], # 1
-        [:on_eol, 3, nil],  # 2
+        [:on_eol, 3, nil], # 2
         [:on_static_text, 3, :source], # 3
         [:on_placeholder, 3, :name], # 4
-        [:on_static_text, 3, :source],  # 5
-        [:on_eol, 3, nil],  # 6
-        [:on_static_text, 3, :source],  # 7
-        [:on_placeholder, 3, :name],  # 8
-        [:on_static_text, 3, :source],  # 9
-        [:on_eol, 3, nil],  # 10
-        [:on_static_text, 3, :source],  # 11
-        [:on_placeholder, 3, :name],  # 12
-        [:on_static_text, 3, :source],  # 13
-        [:on_eol, 3, nil],  # 14
-        [:on_static_text, 3, :source],  # 15
-        [:on_placeholder, 3, :name],  # 16
-        [:on_static_text, 3, :source],  # 17
-        [:on_eol, 3, nil],  # 18
-        [:on_static_text, 3, :source],  # 19
-        [:on_placeholder, 3, :name],  # 20
-        [:on_static_text, 3, :source],  # 21
-        [:on_eol, 3, nil],  # 22
-        [:on_eol, 3, nil],  # 23
+        [:on_static_text, 3, :source], # 5
+        [:on_eol, 3, nil], # 6
+        [:on_static_text, 3, :source], # 7
+        [:on_placeholder, 3, :name], # 8
+        [:on_static_text, 3, :source], # 9
+        [:on_eol, 3, nil], # 10
+        [:on_static_text, 3, :source], # 11
+        [:on_placeholder, 3, :name], # 12
+        [:on_static_text, 3, :source], # 13
+        [:on_eol, 3, nil], # 14
+        [:on_static_text, 3, :source], # 15
+        [:on_placeholder, 3, :name], # 16
+        [:on_static_text, 3, :source], # 17
+        [:on_eol, 3, nil], # 18
+        [:on_static_text, 3, :source], # 19
+        [:on_placeholder, 3, :name], # 20
+        [:on_static_text, 3, :source], # 21
+        [:on_eol, 3, nil], # 22
+        [:on_eol, 3, nil], # 23
         [:on_comment, 3, :source], # 24
-        [:on_eol, 3, nil],  # 25
+        [:on_eol, 3, nil], # 25
         [:on_comment, 3, :source], # 26
-        [:on_eol, 3, nil],  # 27
+        [:on_eol, 3, nil], # 27
         [:on_comment, 3, :source], # 28
-        [:on_eol, 3, nil],  # 29
-        [:on_section, 3, :name],  # 30
-        [:on_static_text, 4, :source],  # 31
-        [:on_placeholder, 4, :name],  # 32
-        [:on_static_text, 4, :source],  # 33
-        [:on_eol, 4, nil],  # 34
-        [:on_section_end, 3, nil],  # 35
-        [:on_eol, 3, nil],  # 36
+        [:on_eol, 3, nil], # 29
+        [:on_section, 3, :name], # 30
+        [:on_static_text, 4, :source], # 31
+        [:on_placeholder, 4, :name], # 32
+        [:on_static_text, 4, :source], # 33
+        [:on_eol, 4, nil], # 34
+        [:on_section_end, 3, nil], # 35
+        [:on_eol, 3, nil], # 36
         [:on_comment, 3, :source], # 37
-        [:on_eol, 3, nil],  # 38
+        [:on_eol, 3, nil], # 38
         [:on_comment, 3, :source], # 39
-        [:on_eol, 3, nil],  # 40
+        [:on_eol, 3, nil], # 40
         [:on_comment, 3, :source], # 41
-        [:on_eol, 3, nil],  # 42
-        [:on_section, 3, :name],  # 43
-        [:on_static_text, 4, :source],  # 44
-        [:on_placeholder, 4, :name],  # 45
-        [:on_static_text, 4, :source],  # 46
-        [:on_eol, 4, nil],  # 47
-        [:on_section_end, 3, nil],  # 48
-        [:on_static_text, 3, :source],  # 49
+        [:on_eol, 3, nil], # 42
+        [:on_section, 3, :name], # 43
+        [:on_static_text, 4, :source], # 44
+        [:on_placeholder, 4, :name], # 45
+        [:on_static_text, 4, :source], # 46
+        [:on_eol, 4, nil], # 47
+        [:on_section_end, 3, nil], # 48
+        [:on_static_text, 3, :source], # 49
         [:on_eol, 3, nil], # 50
-        [:on_renderer_end, 2, nil],  # 51
-        [:on_step_end, 1, nil],  # 52
+        [:on_renderer_end, 2, nil], # 51
+        [:on_step_end, 1, nil], # 52
         [:on_collection_end, 0, nil] # 53
       ].each_with_index do |event, i|
         actual = subject.next

data/spec/macros4cuke/formatter/to-trace_spec.rb

@@ -1,149 +1,148 @@
-# File: to-trace_spec.rb
-
-require 'stringio'
-require_relative '../../spec_helper'
-
-# Load mix-in module for creating a sample collection of macro-steps
-require_relative '../use-sample-collection'
-
-
-require_relative '../../../lib/macros4cuke/formatting-service'
-# Load the class under test
-require_relative '../../../lib/macros4cuke/formatter/to-trace'
-
-module Macros4Cuke
-module Formatter # Open this namespace to get rid of module qualifier prefixes
-describe ToTrace do
-  include UseSampleCollection # Add convenience methods for sample collection
-
-  let(:destination) { StringIO.new }
-
-  before(:all) do
-    # Fill the collection of macro-steps with sample steps
-    fill_collection
-  end
-
-  after(:all) do
-    # Clear the collection to prevent interference between spec files
-    macro_coll.clear
-  end
-
-
-  context 'Initialization:' do
-    it 'should be created with an IO parameter' do
-      expect { ToTrace.new(destination) }.not_to raise_error
-    end
-
-    it 'should react to all the notifications' do
-      instance = ToTrace.new(destination)
-      expect(instance.implements).to eq(Formatter::AllNotifications)
-    end
-  end # context
-
-
-  context 'Provided services:' do
-    # Default instantiation rule
-    subject { ToTrace.new(destination) }
-
-    # The expected event trace for the sample collection
-    let(:expected_trace) do
-      trace_details = <<-SNIPPET
-on_collection
-  on_step
-    on_phrase
-    on_renderer
-      on_source
-      on_static_text
-      on_eol
-      on_static_text
-      on_eol
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_static_text
-      on_eol
-    on_renderer_end
-  on_step_end
-  on_step
-    on_phrase
-    on_renderer
-      on_source
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_static_text
-      on_placeholder
-      on_static_text
-      on_eol
-      on_eol
-      on_comment
-      on_eol
-      on_comment
-      on_eol
-      on_comment
-      on_eol
-      on_section
-        on_static_text
-        on_placeholder
-        on_static_text
-        on_eol
-      on_section_end
-      on_eol
-      on_comment
-      on_eol
-      on_comment
-      on_eol
-      on_comment
-      on_eol
-      on_section
-        on_static_text
-        on_placeholder
-        on_static_text
-        on_eol
-      on_section_end
-      on_static_text
-      on_eol
-    on_renderer_end
-  on_step_end
-on_collection_end
-SNIPPET
-
-      trace_details
-    end
-
-
-    it 'should render the trace event for a given macro-step collection' do
-      service = FormattingService.new
-      service.register(subject)
-      expect { service.start!(macro_coll) }.not_to raise_error
-      expect(subject.io.string).to eq(expected_trace)
-    end
-  end # context
-end # describe
-end # module
-end # module
-
-
-# End of file
+# File: to-trace_spec.rb
+require 'stringio'
+require_relative '../../spec_helper'
+
+# Load mix-in module for creating a sample collection of macro-steps
+require_relative '../use-sample-collection'
+
+
+require_relative '../../../lib/macros4cuke/formatting-service'
+# Load the class under test
+require_relative '../../../lib/macros4cuke/formatter/to-trace'
+
+module Macros4Cuke
+module Formatter # Open this namespace to get rid of module qualifier prefixes
+describe ToTrace do
+  include UseSampleCollection # Add convenience methods for sample collection
+
+  let(:destination) { StringIO.new }
+
+  before(:all) do
+    # Fill the collection of macro-steps with sample steps
+    fill_collection
+  end
+
+  after(:all) do
+    # Clear the collection to prevent interference between spec files
+    macro_coll.clear
+  end
+
+
+  context 'Initialization:' do
+    it 'should be created with an IO parameter' do
+      expect { ToTrace.new(destination) }.not_to raise_error
+    end
+
+    it 'should react to all the notifications' do
+      instance = ToTrace.new(destination)
+      expect(instance.implements).to eq(Formatter::AllNotifications)
+    end
+  end # context
+
+
+  context 'Provided services:' do
+    # Default instantiation rule
+    subject { ToTrace.new(destination) }
+
+    # The expected event trace for the sample collection
+    let(:expected_trace) do
+      trace_details = <<-SNIPPET
+on_collection
+  on_step
+    on_phrase
+    on_renderer
+      on_source
+      on_static_text
+      on_eol
+      on_static_text
+      on_eol
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_static_text
+      on_eol
+    on_renderer_end
+  on_step_end
+  on_step
+    on_phrase
+    on_renderer
+      on_source
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_static_text
+      on_placeholder
+      on_static_text
+      on_eol
+      on_eol
+      on_comment
+      on_eol
+      on_comment
+      on_eol
+      on_comment
+      on_eol
+      on_section
+        on_static_text
+        on_placeholder
+        on_static_text
+        on_eol
+      on_section_end
+      on_eol
+      on_comment
+      on_eol
+      on_comment
+      on_eol
+      on_comment
+      on_eol
+      on_section
+        on_static_text
+        on_placeholder
+        on_static_text
+        on_eol
+      on_section_end
+      on_static_text
+      on_eol
+    on_renderer_end
+  on_step_end
+on_collection_end
+SNIPPET
+
+      trace_details
+    end
+
+
+    it 'should render the trace event for a given macro-step collection' do
+      service = FormattingService.new
+      service.register(subject)
+      expect { service.start!(macro_coll) }.not_to raise_error
+      expect(subject.io.string).to eq(expected_trace)
+    end
+  end # context
+end # describe
+end # module
+end # module
+
+
+# End of file

data/spec/macros4cuke/macro-collection_spec.rb

@@ -39,9 +39,9 @@ SNIPPET
       expect(singleton.macro_steps.size).to eq(1)
 
       # Error case: inserting another macro with same phrase.
+      exc = Macros4Cuke::DuplicateMacroError
       msg = "A macro-step with phrase '[enter my credentials]' already exists."
-      expect { singleton.add_macro(*args) }.to raise_error(
-        Macros4Cuke::DuplicateMacroError, msg)
+      expect { singleton.add_macro(*args) }.to raise_error(exc, msg)
     end
 
     it 'should return the rendition of a given macro-step' do

data/spec/macros4cuke/macro-step-support_spec.rb

@@ -1,5 +1,4 @@
 # File: macro-step_spec.rb
-
 require_relative '../spec_helper'
 
 # The class under test
@@ -50,29 +49,31 @@ SNIPPET
     end
 
     it 'should complain when entering the same macro again' do
+      txt = phrase1
+      substeps = m1_substeps
       # Error case: trying to register another macro with same key/phrase.
-      error_type = Macros4Cuke::DuplicateMacroError
+      exc = Macros4Cuke::DuplicateMacroError
       msg = "A macro-step with phrase 'enter the credentials' already exists."
-      expect { world.add_macro(phrase1, m1_substeps, true) }.to raise_error(
-        error_type, msg)
+      expect { world.add_macro(txt, substeps, true) }.to raise_error(exc, msg)
     end
 
     it 'should complain macro uses no table and phrase is parameterless' do
       # Error case: substeps have arguments,
       # but the macro has no mechanism to pass the needed data.
-      phrase = 'fill in the credentials'
+      txt = 'fill in the credentials'
+      substeps = m1_substeps
+      exc = Macros4Cuke::UnreachableSubstepArgument
       msg = "The sub-step argument 'userid' does not appear in the phrase."
-      expect { world.add_macro(phrase, m1_substeps, false) }.to raise_error(
-        Macros4Cuke::UnreachableSubstepArgument, msg)
+      expect { world.add_macro(txt, substeps, false) }.to raise_error(exc, msg)
     end
   end # context
 
   context 'Invoking macro(s):' do
     it 'should complain when invoking an unknown macro-step' do
       phrase_unknown = 'dream of a perfect world'
+      exc = Macros4Cuke::UnknownMacroError
       msg = "Unknown macro-step with phrase: 'dream of a perfect world'."
-      expect { world.invoke_macro(phrase_unknown) }.to raise_error(
-        Macros4Cuke::UnknownMacroError, msg)
+      expect { world.invoke_macro(phrase_unknown) }.to raise_error(exc, msg)
     end
 
     it "should call the 'steps' method with substeps and variables" do

data/spec/macros4cuke/macro-step_spec.rb

@@ -37,17 +37,18 @@ SNIPPET
     it 'should complain when a sub-step argument can never be assigned' do
       phrase = sample_phrase
       template = sample_template
+      exc = Macros4Cuke::UnreachableSubstepArgument
       msg = "The sub-step argument 'password' does not appear in the phrase."
-      expect { MacroStep.new(phrase, template, false) }.to raise_error(
-        Macros4Cuke::UnreachableSubstepArgument, msg)
+      expect { MacroStep.new(phrase, template, false) }.to raise_error(exc, msg)
     end
 
 
     it 'should complain when an argument in phrase never occurs in substeps' do
       phrase = 'enter my credentials as <foobar>'
+      exc = Macros4Cuke::UselessPhraseArgument
       msg = "The phrase argument 'foobar' does not appear in a sub-step."
-      expect { MacroStep.new(phrase, sample_template, true) }.to raise_error(
-        Macros4Cuke::UselessPhraseArgument, msg)
+      template = sample_template
+      expect { MacroStep.new(phrase, template, true) }.to raise_error(exc, msg)
     end
 
     it 'should know its phrase' do
@@ -114,20 +115,20 @@ SNIPPET
 
     it 'should complain when an unknown variable is used' do
       # Error case: there is no macro argument called <unknown>
-      error_message = "Unknown macro-step argument 'unknown'."
+      exc = UnknownArgumentError
+      msg = "Unknown macro-step argument 'unknown'."
       args = [ %w(unknown anything) ]
-      expect { subject.expand(phrase_instance, args) }.to raise_error(
-        UnknownArgumentError, error_message)
+      expect { subject.expand(phrase_instance, args) }.to raise_error(exc, msg)
     end
 
 
     it 'should complain when argument gets a value from phrase and table' do
       # Error case: there is no macro argument called <unknown>
       phrase = 'enter my credentials as "nobody"'
+      exc = AmbiguousArgumentValue
       msg = "The macro argument 'userid' has value 'nobody' and 'someone'."
       args = [ %w(userid someone), %w(password no-secret) ]
-      expect { subject.expand(phrase, args) }.to raise_error(
-        AmbiguousArgumentValue, msg)
+      expect { subject.expand(phrase, args) }.to raise_error(exc, msg)
     end
 
 

data/spec/macros4cuke/templating/comment_spec.rb

@@ -1,38 +1,37 @@
-# File: comment_spec.rb
-
-require_relative '../../spec_helper'
-
-# Load the classes under test
-require_relative '../../../lib/macros4cuke/templating/comment'
-
-module Macros4Cuke
-module Templating # Open this namespace to get rid of module qualifier prefixes
-describe Comment do
-  let(:sample_text) { 'Some text' }
-  
-  subject { Comment.new(sample_text) }
-
-  context 'Creation and initialization:' do
-    it 'should be created with a text' do
-      expect { Comment.new(sample_text) }.not_to raise_error
-    end
-    
-    it 'should know its source text' do
-      expect(subject.source).to eq(sample_text)
-    end
-    
-  end # context
-  
-  context 'Provided services:' do
-    it 'should render tan empty text' do
-      context = double('fake_context')
-      locals = double('fake_locals')
-      
-      expect(subject.render(context, locals)).to be_empty
-    end
-  end # context  
-end # describe
-end # module
-end # module
-
-# End of file
+# File: comment_spec.rb
+require_relative '../../spec_helper'
+
+# Load the classes under test
+require_relative '../../../lib/macros4cuke/templating/comment'
+
+module Macros4Cuke
+module Templating # Open this namespace to get rid of module qualifier prefixes
+describe Comment do
+  let(:sample_text) { 'Some text' }
+  
+  subject { Comment.new(sample_text) }
+
+  context 'Creation and initialization:' do
+    it 'should be created with a text' do
+      expect { Comment.new(sample_text) }.not_to raise_error
+    end
+    
+    it 'should know its source text' do
+      expect(subject.source).to eq(sample_text)
+    end
+    
+  end # context
+  
+  context 'Provided services:' do
+    it 'should render tan empty text' do
+      context = double('fake_context')
+      locals = double('fake_locals')
+      
+      expect(subject.render(context, locals)).to be_empty
+    end
+  end # context  
+end # describe
+end # module
+end # module
+
+# End of file