sapphire 0.5.3 → 0.5.4

data/lib/sapphire/DSL/Scenarios/background.rb

@@ -1,34 +1,34 @@
-class Background
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_reader :text
-  attr_reader :block
-  attr_reader :parent
-  attr_reader :results
-  attr_reader :and
-
-  def initialize(parent, pre, text, &block)
-    @block = block
-    @value = text
-    @text = pre + text.to_s
-    @parent = parent
-    @results = []
-    @and = []
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.result.AddChild(result)
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
+class Background
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_reader :text
+  attr_reader :block
+  attr_reader :parent
+  attr_reader :results
+  attr_reader :and
+
+  def initialize(parent, pre, text, &block)
+    @block = block
+    @value = text
+    @text = pre + text.to_s
+    @parent = parent
+    @results = []
+    @and = []
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.result.AddChild(result)
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
 end

data/lib/sapphire/DSL/Scenarios/dsl.rb

@@ -1,59 +1,59 @@
-module Sapphire
-  module DSL
-    module Scenarios
-      def Background(text, &block)
-        Runner.instance.last_scenario.add_background(Background.new(Runner.instance.last_scenario, "Assuming that ", text, &block))
-      end
-
-      def Given(text, &block)
-        Runner.instance.last_scenario.add_given(Given.new(Runner.instance.last_scenario, "Given ", text, &block))
-      end
-
-      def When(text, &block)
-        Runner.instance.last_scenario.last_given.add_when("When ", text, &block)
-      end
-
-      def Then(text, &block)
-        Runner.instance.last_scenario.last_given.last_when.add_then("Then ", text, &block)
-      end
-
-      def And(text, &block)
-
-        if(Runner.instance.last_scenario.last_given == nil && Runner.instance.last_scenario.last_background != nil)
-          Runner.instance.last_scenario.last_background.add_and("And ", text, &block)
-          return
-        end
-
-        if(Runner.instance.last_scenario.last_given.finally != nil)
-          Runner.instance.last_scenario.last_given.finally.add_and("And ", text, &block)
-          return
-        end
-
-        if(Runner.instance.last_scenario.last_given.last_when == nil)
-          Runner.instance.last_scenario.last_given.add_and("And ", text, &block)
-          return
-        end
-
-        if(Runner.instance.last_scenario.last_given.last_when.last_then == nil)
-          Runner.instance.last_scenario.last_given.last_when.add_and("And ", text, &block)
-          return
-        end
-
-        if (Runner.instance.last_scenario.last_given.last_when.last_then != nil)
-          Runner.instance.last_scenario.last_given.last_when.last_then.add_and("And ", text, &block)
-        end
-      end
-
-      def Finally(text, &block)
-        Runner.instance.last_scenario.last_given.add_finally(Finally.new(Runner.instance.last_scenario.last_given, text, &block))
-      end
-
-      def Scenario(text, &block)
-        Runner.instance.add_scenario(Scenario.new(text, &block))
-        Runner.instance.last_scenario.block.call
-      end
-    end
-  end
-end
-
-
+module Sapphire
+  module DSL
+    module Scenarios
+      def Background(text, &block)
+        Runner.instance.last_scenario.add_background(Background.new(Runner.instance.last_scenario, "Assuming that ", text, &block))
+      end
+
+      def Given(text, &block)
+        Runner.instance.last_scenario.add_given(Given.new(Runner.instance.last_scenario, "Given ", text, &block))
+      end
+
+      def When(text, &block)
+        Runner.instance.last_scenario.last_given.add_when("When ", text, &block)
+      end
+
+      def Then(text, &block)
+        Runner.instance.last_scenario.last_given.last_when.add_then("Then ", text, &block)
+      end
+
+      def And(text, &block)
+
+        if(Runner.instance.last_scenario.last_given == nil && Runner.instance.last_scenario.last_background != nil)
+          Runner.instance.last_scenario.last_background.add_and("And ", text, &block)
+          return
+        end
+
+        if(Runner.instance.last_scenario.last_given.finally != nil)
+          Runner.instance.last_scenario.last_given.finally.add_and("And ", text, &block)
+          return
+        end
+
+        if(Runner.instance.last_scenario.last_given.last_when == nil)
+          Runner.instance.last_scenario.last_given.add_and("And ", text, &block)
+          return
+        end
+
+        if(Runner.instance.last_scenario.last_given.last_when.last_then == nil)
+          Runner.instance.last_scenario.last_given.last_when.add_and("And ", text, &block)
+          return
+        end
+
+        if (Runner.instance.last_scenario.last_given.last_when.last_then != nil)
+          Runner.instance.last_scenario.last_given.last_when.last_then.add_and("And ", text, &block)
+        end
+      end
+
+      def Finally(text, &block)
+        Runner.instance.last_scenario.last_given.add_finally(Finally.new(Runner.instance.last_scenario.last_given, text, &block))
+      end
+
+      def Scenario(text, &block)
+        Runner.instance.add_scenario(Scenario.new(text, &block))
+        Runner.instance.last_scenario.block.call
+      end
+    end
+  end
+end
+
+

data/lib/sapphire/DSL/Scenarios/finally.rb

@@ -1,34 +1,34 @@
-class Finally
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_reader :block
-  attr_reader :text
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, text, &block)
-    @value = text
-    @text = text.to_s
-    @block = block
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.AddResult(result)
-  end
-
+class Finally
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_reader :block
+  attr_reader :text
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, text, &block)
+    @value = text
+    @text = text.to_s
+    @block = block
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.AddResult(result)
+  end
+
 end

data/lib/sapphire/DSL/Scenarios/given.rb

@@ -1,58 +1,58 @@
-class Given
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_reader :text
-  attr_reader :block
-  attr_reader :finally
-  attr_reader :when
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, pre, text, &block)
-    @value = text
-    @text = pre + text.to_s
-    @block = block
-    @when = []
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_when(pre, text, &block)
-    if(self.value.is_a? Pending)
-      @when << When.new(self, pre, Pending.new(text), &block)
-    else
-      x = When.new(self, pre, text, &block)
-      @when << x
-    end
-  end
-
-  def last_when()
-    @when.last
-  end
-
-  def add_finally(finally)
-    if(self.value.is_a? Pending)
-      @finally = Finally.new(self, Pending.new(finally.text), &block)
-    else
-      @finally = finally
-    end
-  end
-
-  def add_and(pre, text, &block)
-    if(self.value.is_a? Pending)
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    else
-      self.and << And.new(self, pre + text, &block)
-    end
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.result.AddChild(result)
-  end
-
+class Given
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_reader :text
+  attr_reader :block
+  attr_reader :finally
+  attr_reader :when
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, pre, text, &block)
+    @value = text
+    @text = pre + text.to_s
+    @block = block
+    @when = []
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_when(pre, text, &block)
+    if(self.value.is_a? Pending)
+      @when << When.new(self, pre, Pending.new(text), &block)
+    else
+      x = When.new(self, pre, text, &block)
+      @when << x
+    end
+  end
+
+  def last_when()
+    @when.last
+  end
+
+  def add_finally(finally)
+    if(self.value.is_a? Pending)
+      @finally = Finally.new(self, Pending.new(finally.text), &block)
+    else
+      @finally = finally
+    end
+  end
+
+  def add_and(pre, text, &block)
+    if(self.value.is_a? Pending)
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    else
+      self.and << And.new(self, pre + text, &block)
+    end
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.result.AddChild(result)
+  end
+
 end

data/lib/sapphire/DSL/Scenarios/runner.rb

@@ -1,40 +1,40 @@
-module Sapphire
-  module DSL
-    module Scenarios
-      class Runner
-        attr_accessor :scenarios
-        attr_accessor :test_plans
-
-        def self.create
-          @@instance ||= Runner.new
-        end
-
-        def self.instance
-          @@instance ||= self.create
-        end
-
-        def initialize
-          @scenarios = []
-          @test_plans = []
-        end
-
-        def add_scenario(scenario)
-          @scenarios << scenario
-        end
-
-        def last_scenario
-          @scenarios.last
-        end
-
-        def add_test_plan(test_plan)
-          @test_plans << test_plan
-        end
-
-        def last_test_plan
-          @test_plans.last
-        end
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Scenarios
+      class Runner
+        attr_accessor :scenarios
+        attr_accessor :test_plans
+
+        def self.create
+          @@instance ||= Runner.new
+        end
+
+        def self.instance
+          @@instance ||= self.create
+        end
+
+        def initialize
+          @scenarios = []
+          @test_plans = []
+        end
+
+        def add_scenario(scenario)
+          @scenarios << scenario
+        end
+
+        def last_scenario
+          @scenarios.last
+        end
+
+        def add_test_plan(test_plan)
+          @test_plans << test_plan
+        end
+
+        def last_test_plan
+          @test_plans.last
+        end
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Scenarios/scenario.rb

@@ -1,53 +1,53 @@
-module Sapphire
-  module DSL
-    module Scenarios
-      class Scenario
-        include Sapphire::Testing::TestRunnerAdapter
-
-        attr_reader :block
-        attr_reader :value
-        attr_reader :text
-        attr_reader :givens
-        attr_reader :backgrounds
-        attr_reader :result
-        attr_accessor :file_name
-
-        def initialize(text, &block)
-          @value = text
-          @text = text.to_s
-          @block = block
-          @givens = []
-          @backgrounds = []
-          @result = Testing::ScenarioResult.new(text)
-          @file_name = ""
-        end
-
-        def add_given(given)
-          if(self.value.is_a? Pending)
-            @givens << Given.new(self, "", Pending.new(given.text), &block)
-          else
-            @givens << given
-          end
-        end
-
-        def last_given
-          @givens.last
-        end
-
-        def add_background(background)
-          if(self.value.is_a? Pending)
-            @backgrounds << Background.new(self, "", Pending.new(background.text), &block)
-          else
-            @backgrounds << background
-          end
-        end
-
-        def last_background
-          @backgrounds.last
-        end
-
-      end
-    end
-  end
-end
-
+module Sapphire
+  module DSL
+    module Scenarios
+      class Scenario
+        include Sapphire::Testing::TestRunnerAdapter
+
+        attr_reader :block
+        attr_reader :value
+        attr_reader :text
+        attr_reader :givens
+        attr_reader :backgrounds
+        attr_reader :result
+        attr_accessor :file_name
+
+        def initialize(text, &block)
+          @value = text
+          @text = text.to_s
+          @block = block
+          @givens = []
+          @backgrounds = []
+          @result = Testing::ScenarioResult.new(text)
+          @file_name = ""
+        end
+
+        def add_given(given)
+          if(self.value.is_a? Pending)
+            @givens << Given.new(self, "", Pending.new(given.text), &block)
+          else
+            @givens << given
+          end
+        end
+
+        def last_given
+          @givens.last
+        end
+
+        def add_background(background)
+          if(self.value.is_a? Pending)
+            @backgrounds << Background.new(self, "", Pending.new(background.text), &block)
+          else
+            @backgrounds << background
+          end
+        end
+
+        def last_background
+          @backgrounds.last
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sapphire/DSL/Scenarios/then.rb

@@ -1,35 +1,35 @@
-class Then
-  include Sapphire::Testing::Executable
-
-  attr_reader :value
-  attr_accessor :text
-  attr_reader :block
-  attr_reader :and
-  attr_reader :parent
-  attr_reader :results
-
-  def initialize(parent, pre, text, &block)
-    @block = block
-    @value = text
-    @text = pre + text.to_s
-    @and = []
-    @parent = parent
-    @results = []
-  end
-
-  def add_and(pre, text, &block)
-    if(!self.value.instance_of? Pending)
-      x = And.new(self, text, &block)
-      self.and << x
-    else
-      self.and << And.new(self, Pending.new(pre + text), &block)
-    end
-  end
-
-  def AddResult(result)
-    result.item = self
-    @results << result
-    self.parent.results.last.AddChild(result)
-  end
-
+class Then
+  include Sapphire::Testing::Executable
+
+  attr_reader :value
+  attr_accessor :text
+  attr_reader :block
+  attr_reader :and
+  attr_reader :parent
+  attr_reader :results
+
+  def initialize(parent, pre, text, &block)
+    @block = block
+    @value = text
+    @text = pre + text.to_s
+    @and = []
+    @parent = parent
+    @results = []
+  end
+
+  def add_and(pre, text, &block)
+    if(!self.value.instance_of? Pending)
+      x = And.new(self, text, &block)
+      self.and << x
+    else
+      self.and << And.new(self, Pending.new(pre + text), &block)
+    end
+  end
+
+  def AddResult(result)
+    result.item = self
+    @results << result
+    self.parent.results.last.AddChild(result)
+  end
+
 end