taza 0.8.5 → 0.8.6

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.8.6
+
+* Added feature to keep browser open after tests
+* Added access to multiple levels in Fixtures
+* Added feature to return a Hash in Fixtures 
+* lib/flows is no longer generated
+* Page module filters for elements inside page modules
+
 === 0.8.5
 
 * Fixed Fixtures bugs

data/VERSION.yml

@@ -1,4 +1,4 @@
---- 
-:patch: 5
-:major: 0
-:minor: 8
+--- 
+:patch: 6
+:major: 0
+:minor: 8

data/lib/app_generators/taza/taza_generator.rb

@@ -30,7 +30,6 @@ class TazaGenerator < RubiGen::Base
   def create_directories(m)
     BASEDIRS.each { |path| m.directory path }
     m.directory File.join('lib','sites')
-    m.directory File.join('lib','flows')
     m.directory File.join('spec','isolation')
     m.directory File.join('spec','integration')
     m.directory File.join('spec','story')

data/lib/taza/entity.rb

@@ -20,16 +20,30 @@ module Taza
     #This method will lookup another fixture if a pluralized fixture exists otherwise return the value in the hash
     def get_value_for_entry(key) # :nodoc:
       if @fixture.nil?
-        @hash[key]
+        create_entity_if_value_is_hash(key)
       elsif @fixture.fixture_exists?(key)
         @fixture.specific_fixture_entities(key.to_sym, @hash[key])
       elsif @fixture.pluralized_fixture_exists?(key)
         @fixture.get_fixture_entity(key.pluralize.to_sym,@hash[key])
       else
-        @hash[key]
+        create_entity_if_value_is_hash(key)
       end
     end
     alias :[] :get_value_for_entry
+    
+    def create_entity_if_value_is_hash(key)
+      if (@fixture.nil? && @hash[key].is_a?(Hash))
+          Entity.new(@hash[key], nil)
+      elsif (!@fixture.nil? && @hash[key].is_a?(Hash))
+          Entity.new(@hash[key], @fixture)
+      else
+          @hash[key]
+      end
+    end
+
+    def to_hash
+      @hash
+    end
 
     private
     def create_method(name, &block) # :nodoc:

data/lib/taza/page.rb

@@ -35,6 +35,8 @@ module Taza
       if !@module.nil?
         self.elements[@module] = Hash.new if self.elements[@module].nil?
         self.elements[@module] = self.elements[@module].merge({ name => block })
+      elsif !self.elements[name].nil?
+        raise ElementError,"Duplicate definations for Element - #{name} on Page - #{self.to_s}"
       else
         self.elements[name] = block
       end
@@ -74,6 +76,13 @@ module Taza
       yield(block)
       @module = nil
     end
+    
+    def self.page_module_filter(method_name, page_module_name, *elements)
+      elements = [page_module_name] if elements.empty?
+      elements.each do |element|
+        self.filters[element] = self.filters[element] << method_name
+      end
+    end
 
     def initialize(page_module = nil)
       add_element_methods(page_module)
@@ -84,7 +93,7 @@ module Taza
       self.class.elements.each do |element_name,element_block|
         if (element_block.is_a?(Hash) && !page_module.nil? && page_module==element_name)
           element_block.each do |key,value|
-            filters = self.class.filters[element_name] + self.class.filters[:all]
+            filters = self.class.filters[element_name] + self.class.filters[:all] + self.class.filters[key]
             add_element_method(:filters => filters, :element_name => key, :element_block => value)
           end
         else
@@ -115,4 +124,5 @@ module Taza
   end
 
   class FilterError < StandardError; end
+  class ElementError < StandardError; end
 end

data/lib/taza/site.rb

@@ -18,6 +18,7 @@ module Taza
   #   end
   class Site
     @@before_browser_closes = Proc.new() {}
+    @@donot_close_browser = false
     # Use this to do something with the browser before it closes, but note that it is a class method which
     # means that this will get called for any instance of a site.
     #
@@ -29,6 +30,10 @@ module Taza
     def self.before_browser_closes(&block)
       @@before_browser_closes = block
     end
+
+    def self.donot_close_browser
+      @@donot_close_browser = true
+    end
     attr_accessor :browser
 
     # A site can be called a few different ways
@@ -81,7 +86,7 @@ module Taza
 
     def close_browser_and_raise_if original_error # :nodoc:
       begin
-        @browser.close if @i_created_browser
+        @browser.close if (@i_created_browser && !@@donot_close_browser)
       ensure
         raise original_error if original_error
       end

data/spec/entity_spec.rb

@@ -12,4 +12,14 @@ describe Taza::Entity do
     entity[:apple].should eql('pie')
   end
 
+  it "should be able to define methods for multiple levels" do
+    entity = Taza::Entity.new({:fruits => {:apple => 'pie'} },nil)
+    entity.fruits.apple.should eql('pie')
+  end
+
+  it "should be able to return a hash object" do
+    entity = Taza::Entity.new({:apple => 'pie' },nil)
+    entity.to_hash[:apple].should eql('pie')
+  end
+
 end

data/spec/fixtures_spec.rb

@@ -39,5 +39,9 @@ describe "Taza::Fixtures" do
   it "should be able to get one to many entities for hash[key] style" do
     foos(:gap)['examples']['first_example']['name'].should eql('first')
   end
+  
+  it "should be able to access multiple levels inside fixtures" do
+    examples(:forth_example).something.user('shatner').name.should eql('William Shatner') 
+  end
 
 end

data/spec/page_module_spec.rb

@@ -101,4 +101,65 @@ describe "Taza Page Module" do
     lambda { page.sample_element }.should raise_error(Taza::FilterError)
   end
 
+  class PageWithFilterAndModuleElements < ::Taza::Page
+    page_module :module do
+      element(:sample_element) {:something}
+    end
+    page_module_filter :sample_filter, :module, :sample_element
+    def sample_filter
+      false
+    end
+  end
+
+  it "should execute filters for elements inside page modules" do
+    page = PageWithFilterAndModuleElements.new(:module)
+    lambda { page.sample_element }.should raise_error(Taza::FilterError)
+  end
+
+  class PageWithFiltersAndModuleElements < ::Taza::Page
+    page_module :module do
+      element(:sample_element) {:something}
+      element(:another_sample_element) {:something}
+    end
+    page_module_filter :sample_filter, :module
+    def sample_filter
+      true
+    end
+    page_module_filter :another_sample_filter, :module, :sample_element
+    def another_sample_filter
+      false
+    end
+  end
+
+  it "should execute filters for specific and all elements inside page modules" do
+    page = PageWithFiltersAndModuleElements.new(:module)
+    lambda { page.sample_element }.should raise_error(Taza::FilterError)
+    page.another_sample_element.should eql(:something)
+  end
+  
+  class PageWithFiltersAndModulesAndElements < ::Taza::Page
+    page_module :foo_module do
+      element(:sample_element) {:something}
+    end
+    page_module_filter :foo_filter, :foo_module
+    def foo_filter
+      true
+    end
+    page_module :bar_module do
+      element(:sample_element) {:nothing}
+    end
+    page_module_filter :bar_filter, :bar_module
+    def bar_filter
+      false
+    end
+  end
+
+  it "should execute page module filters for identical element names appropriately" do
+    foo = PageWithFiltersAndModulesAndElements.new(:foo_module)
+    foo.sample_element.should eql(:something)
+    bar = PageWithFiltersAndModulesAndElements.new(:bar_module)
+    lambda { bar.sample_element }.should raise_error(Taza::FilterError)
+ end
+
+
 end

data/spec/page_spec.rb

@@ -93,4 +93,13 @@ describe Taza::Page do
     lambda { page.false_item }.should raise_error
     page.called_element_method.should_not be_true
   end
+
+  it "should not allow more than one element descriptor with the same element name" do
+    lambda{
+    class DuplicateElements < Taza::Page
+      element(:foo) { true }
+      element(:foo) { false }
+    end
+    }.should raise_error(Taza::ElementError)
+  end
 end

data/spec/sandbox/fixtures/examples.yml

@@ -10,3 +10,6 @@ third_example:
   name: third
   price: 3
   user: shatner
+forth_example:
+  something:
+    user: shatner

data/spec/site_spec.rb

@@ -240,7 +240,7 @@ describe Taza::Site do
     barzor.some_element.should eql(:some_element_value)
   end
 
-  it "should raise an error when accessing an element taht belongs to another module" do
+  it "should raise an error when accessing an element that belongs to another module" do
     f = Foo.new(:browser => stub_browser)
     barzor = nil
     f.baz(:another_module) do |baz|
@@ -249,4 +249,19 @@ describe Taza::Site do
     lambda{barzor.other_element}.should raise_error(NoMethodError)
   end
 
+  it "should have a way to keep the browser instance open" do
+    browser = stub_browser
+    browser.expects(:close).never
+    Taza::Browser.stubs(:create).returns(browser)
+    Taza::Site.donot_close_browser
+    Foo.new {}
+  end
+  
+  it "should have a way to keep the browser instance open if an error is raised" do
+    browser = stub_browser
+    browser.expects(:close).never
+    Taza::Browser.stubs(:create).returns(browser)
+    Taza::Site.donot_close_browser
+    lambda { Foo.new { |site| raise StandardError}}.should raise_error
+  end
 end

data/taza.gemspec

@@ -0,0 +1,46 @@
+Gem::Specification.new do |s|
+  s.name = %q{taza}
+  s.version = "0.8.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Adam Anderson"]
+  s.date = %q{2009-04-08}
+  s.default_executable = %q{taza}
+  s.description = %q{Taza is an opionated browser-based testing framework.}
+  s.email = %q{adamandersonis@gmail.com}
+  s.executables = ["taza"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README"]
+  s.files = ["History.txt", "Manifest.txt", "README.textile", "taza.gemspec", "VERSION.yml", "bin/taza", "generators/flow", "generators/flow/flow_generator.rb", "generators/flow/templates", "generators/flow/templates/flow.rb.erb", "generators/page", "generators/page/page_generator.rb", "generators/page/templates", "generators/page/templates/functional_page_spec.rb.erb", "generators/page/templates/page.rb.erb", "generators/partial", "generators/partial/partial_generator.rb", "generators/partial/templates", "generators/partial/templates/partial.rb.erb", "generators/site", "generators/site/site_generator.rb", "generators/site/templates", "generators/site/templates/site.rb.erb", "generators/site/templates/site.yml.erb", "lib/app_generators", "lib/app_generators/taza", "lib/app_generators/taza/taza_generator.rb", "lib/app_generators/taza/templates", "lib/app_generators/taza/templates/config.yml.erb", "lib/app_generators/taza/templates/rakefile.rb.erb", "lib/app_generators/taza/templates/spec_helper.rb.erb", "lib/extensions", "lib/extensions/array.rb", "lib/extensions/hash.rb", "lib/extensions/object.rb", "lib/extensions/string.rb", "lib/taza", "lib/taza/browser.rb", "lib/taza/browsers", "lib/taza/entity.rb", "lib/taza/fixture.rb", "lib/taza/fixtures.rb", "lib/taza/flow.rb", "lib/taza/page.rb", "lib/taza/settings.rb", "lib/taza/site.rb", "lib/taza/tasks.rb", "lib/taza.rb", "spec/array_spec.rb", "spec/browser_spec.rb", "spec/entity_spec.rb", "spec/fixtures_spec.rb", "spec/fixture_spec.rb", "spec/flow_generator_spec.rb", "spec/hash_spec.rb", "spec/object_spec.rb", "spec/page_generator_spec.rb", "spec/page_module_spec.rb", "spec/page_spec.rb", "spec/partial_generator_spec.rb", "spec/platform", "spec/platform/osx", "spec/platform/windows", "spec/project_generator_spec.rb", "spec/sandbox", "spec/sandbox/config", "spec/sandbox/config/config.yml", "spec/sandbox/config/site_name.yml", "spec/sandbox/config.yml", "spec/sandbox/fixtures", "spec/sandbox/fixtures/examples.yml", "spec/sandbox/fixtures/foos.yml", "spec/sandbox/fixtures/foo_site", "spec/sandbox/fixtures/foo_site/bars.yml", "spec/sandbox/fixtures/users.yml", "spec/sandbox/flows", "spec/sandbox/flows/batman.rb", "spec/sandbox/flows/robin.rb", "spec/sandbox/pages", "spec/sandbox/pages/foo", "spec/sandbox/pages/foo/bar.rb", "spec/sandbox/pages/foo/bay.rb", "spec/sandbox/pages/foo/baz.rb", "spec/sandbox/pages/foo/partials", "spec/sandbox/pages/foo/partials/partial_the_reckoning.rb", "spec/settings_spec.rb", "spec/site_fixtures_spec.rb", "spec/site_generator_spec.rb", "spec/site_spec.rb", "spec/spec_helper.rb", "spec/string_spec.rb", "spec/taza_bin_spec.rb", "spec/taza_tasks_spec.rb", "README"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/scudco/taza}
+  s.rdoc_options = ["--main", "README", "--inline-source", "--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{taza}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{Taza is an opionated browser-based testing framework.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<taglob>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<rake>, [">= 0.8.3"])
+      s.add_runtime_dependency(%q<mocha>, [">= 0.9.3"])
+      s.add_runtime_dependency(%q<rspec>, [">= 1.1.12"])
+      s.add_runtime_dependency(%q<rubigen>, [">= 1.4.0"])
+    else
+      s.add_dependency(%q<taglob>, [">= 1.1.1"])
+      s.add_dependency(%q<rake>, [">= 0.8.3"])
+      s.add_dependency(%q<mocha>, [">= 0.9.3"])
+      s.add_dependency(%q<rspec>, [">= 1.1.12"])
+      s.add_dependency(%q<rubigen>, [">= 1.4.0"])
+    end
+  else
+    s.add_dependency(%q<taglob>, [">= 1.1.1"])
+    s.add_dependency(%q<rake>, [">= 0.8.3"])
+    s.add_dependency(%q<mocha>, [">= 0.9.3"])
+    s.add_dependency(%q<rspec>, [">= 1.1.12"])
+    s.add_dependency(%q<rubigen>, [">= 1.4.0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taza
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - Adam Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 -08:00
+date: 2009-04-08 00:00:00 -07:00
 default_executable: taza
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - History.txt
 - Manifest.txt
 - README.textile
+- taza.gemspec
 - VERSION.yml
 - bin/taza
 - generators/flow
@@ -110,6 +111,7 @@ files:
 - lib/extensions/string.rb
 - lib/taza
 - lib/taza/browser.rb
+- lib/taza/browsers
 - lib/taza/entity.rb
 - lib/taza/fixture.rb
 - lib/taza/fixtures.rb
@@ -122,8 +124,8 @@ files:
 - spec/array_spec.rb
 - spec/browser_spec.rb
 - spec/entity_spec.rb
-- spec/fixture_spec.rb
 - spec/fixtures_spec.rb
+- spec/fixture_spec.rb
 - spec/flow_generator_spec.rb
 - spec/hash_spec.rb
 - spec/object_spec.rb
@@ -131,6 +133,9 @@ files:
 - spec/page_module_spec.rb
 - spec/page_spec.rb
 - spec/partial_generator_spec.rb
+- spec/platform
+- spec/platform/osx
+- spec/platform/windows
 - spec/project_generator_spec.rb
 - spec/sandbox
 - spec/sandbox/config
@@ -139,9 +144,9 @@ files:
 - spec/sandbox/config.yml
 - spec/sandbox/fixtures
 - spec/sandbox/fixtures/examples.yml
+- spec/sandbox/fixtures/foos.yml
 - spec/sandbox/fixtures/foo_site
 - spec/sandbox/fixtures/foo_site/bars.yml
-- spec/sandbox/fixtures/foos.yml
 - spec/sandbox/fixtures/users.yml
 - spec/sandbox/flows
 - spec/sandbox/flows/batman.rb
@@ -187,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: taza
-rubygems_version: 1.3.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Taza is an opionated browser-based testing framework.