kookaburra 0.6.0 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/kookaburra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renewable Funding, LLC"]
-  s.date = "2012-01-18"
+  s.date = "2012-01-22"
   s.description = "Cucumber + Capybara = Kookaburra? It made sense at the time."
   s.email = "devteam@renewfund.com"
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/kookaburra/ui_driver/mixins/has_ui_component.rb",
     "lib/kookaburra/ui_driver/ui_component.rb",
     "test/helper.rb",
+    "test/kookaburra/test_data_test.rb",
     "test/kookaburra/ui_driver_test.rb",
     "test/kookaburra_test.rb"
   ]

data/lib/kookaburra/test_data.rb

@@ -1,9 +1,12 @@
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/hash'
 
 # This is the mechanism for sharing state between Cucumber steps.
 # If you're using instance variables, YOU'RE DOING IT WRONG.
 module Kookaburra
   class TestData
+    Defaults = HashWithIndifferentAccess.new
+
     def initialize
       @data = Hash.new do |hash, key|
         hash[key] = Hash.new { |hash, key| hash[key] = HashWithIndifferentAccess.new }
@@ -13,20 +16,24 @@ module Kookaburra
     def __collection(collection_key)
       @data[collection_key]
     end
+
     def __fetch_data(collection_key, value_key)
       __collection(collection_key).fetch(value_key)
     rescue IndexError => e
       raise e.exception("Key #{value_key.inspect} not found in #{collection_key}")
     end
+
     def __get_data(collection_key, value_key)
       __collection(collection_key)[value_key]
     end
+
     def __set_data(collection_key, value_key, value_hash = {})
       __collection(collection_key)[value_key] = HashWithIndifferentAccess.new(value_hash)
     end
 
-    def self.provide_collection(name)
-      class_eval <<-RUBY
+    class << self
+      def provide_collection(name)
+        class_eval <<-RUBY
         def #{name}(key = :default)
           __get_data(:#{name}, key)
         end
@@ -36,14 +43,20 @@ module Kookaburra
         def set_#{name}(key, value_hash = {})
           __set_data(:#{name}, key, value_hash)
         end
-      RUBY
+        RUBY
+      end
+
+      def set_default(key, value)
+        Kookaburra::TestData::Defaults[key] = value
+      end
+
+      def default(key)
+        Defaults[key]
+      end
     end
 
-    Defaults = HashWithIndifferentAccess.new
     def default(key)
-      # NOTE: Marshal seems clunky, but gives us a deep copy.
-      # This keeps mutations from being preserved between test runs.
-      ( @default ||= Marshal::load(Marshal.dump(Defaults)) )[key]
+      (@defaults ||= Defaults.deep_dup)[key]
     end
   end
 end

data/lib/kookaburra.rb

@@ -83,12 +83,8 @@ module Kookaburra
       @ui_driver ||= Kookaburra::UIDriver
     end
 
-    # The TestData class that will be used by Kookaburra, typically a subclass of
-    # Kookaburra::TestData.
-    attr_accessor :test_data
-
-    def test_data
-      @test_data ||= Kookaburra::TestData
+    def test_data_setup(&blk)
+      Kookaburra::TestData.class_eval(&blk)
     end
   end
 
@@ -146,7 +142,7 @@ module Kookaburra
   # The Kookaburra::TestData instance should not be used directly, but all of
   # the drivers should reference the same instance.
   def kookaburra_test_data
-    kookaburra_drivers[:test_data] ||= Kookaburra.test_data.new
+    kookaburra_drivers[:test_data] ||= Kookaburra::TestData.new
   end
 
   # Holds references to all drivers in a single hash, so that

data/test/kookaburra/test_data_test.rb

@@ -0,0 +1,21 @@
+require 'helper'
+
+describe Kookaburra::TestData do
+  describe '.set_default' do
+    it 'stores data that can be used as defaults for tests' do
+      Kookaburra::TestData.set_default(:foo, 'bar')
+      td = Kookaburra::TestData.new
+      assert_equal 'bar', Kookaburra::TestData.default(:foo)
+    end
+  end
+
+  describe '#default' do
+    it 'does not allow default to change between instances' do
+      Kookaburra::TestData.set_default(:foo, 'bar' => 'baz')
+      td1 = Kookaburra::TestData.new
+      td1.default(:foo)['bar'] = 'spam'
+      td2 = Kookaburra::TestData.new
+      assert_equal 'baz', td2.default(:foo)['bar']
+    end
+  end
+end

data/test/kookaburra/ui_driver_test.rb

@@ -31,6 +31,7 @@ describe Kookaburra::UIDriver do
       attr_reader :was_shown, :params
     end
 
+    let(:ui) { ui_class.new }
     let(:ui_class) do
       Class.new(Kookaburra::UIDriver) do
         def browser; end
@@ -41,13 +42,11 @@ describe Kookaburra::UIDriver do
     end
 
     it 'delegates to the UIComponent#show! method' do
-      ui = ui_class.new
       ui.navigate_to :foo
       assert Foo.was_shown, "#show! was never called on the Foo component"
     end
 
     it 'passed any additional options to the UIComponent#show! method' do
-      ui = ui_class.new
       ui.navigate_to :foo, :bar => :baz
       assert_equal({:bar => :baz}, Foo.params)
     end

data/test/kookaburra_test.rb

@@ -169,15 +169,15 @@ describe Kookaburra do
       end
     end
 
-    describe '#test_data' do
-      it 'is a read/write attribute' do
-        Kookaburra.test_data = :a_test_data
-        assert_equal :a_test_data, Kookaburra.test_data
-      end
-
-      it 'defaults to Kookaburra::TestData' do
-        Kookaburra.test_data = nil
-        assert_equal Kookaburra::TestData, Kookaburra.test_data
+    describe '.test_data_setup' do
+      it 'evaluates the block in the context of the TestData class' do
+        Kookaburra.test_data_setup do
+          def added_by_a_test
+            :added_by_a_test
+          end
+        end
+        td = Kookaburra::TestData.new
+        assert_equal :added_by_a_test, td.added_by_a_test
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Renewable Funding, LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-01-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -182,6 +182,7 @@ files:
 - lib/kookaburra/ui_driver/mixins/has_ui_component.rb
 - lib/kookaburra/ui_driver/ui_component.rb
 - test/helper.rb
+- test/kookaburra/test_data_test.rb
 - test/kookaburra/ui_driver_test.rb
 - test/kookaburra_test.rb
 homepage: http://github.com/projectdx/kookaburra