taza 0.8.4 → 0.8.5

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.8.5
+
+* Fixed Fixtures bugs
+* Fixture entities can be accessed like hashes(foo[:bar])
+* Functional tests are now 'isolation' tests
+* Added Page-Module feature
+
 === 0.8.4
 
 * Added one to many relationship in fixtures

data/VERSION.yml

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

data/generators/page/page_generator.rb

@@ -25,7 +25,7 @@ class PageGenerator < RubiGen::Base
   def manifest
     record do |m|
       m.template "page.rb.erb", File.join('lib','sites', site_name.underscore, "pages",  "#{name.underscore}_page.rb")
-      m.template "functional_page_spec.rb.erb", File.join('spec','functional',site_name.underscore,"#{name.underscore}_page_spec.rb")
+      m.template "functional_page_spec.rb.erb", File.join('spec','isolation',site_name.underscore,"#{name.underscore}_page_spec.rb")
     end
   end
 

data/generators/site/site_generator.rb

@@ -21,7 +21,7 @@ class SiteGenerator < RubiGen::Base
       m.directory File.join(site_path,("#{name.underscore}"),"flows")
       m.directory File.join(site_path,("#{name.underscore}"),"pages")
       m.directory File.join(site_path,("#{name.underscore}"),"pages","partials")
-      m.directory File.join('spec','functional',name.underscore)
+      m.directory File.join('spec','isolation',name.underscore)
       m.template "site.yml.erb", File.join('config',"#{name.underscore}.yml")
     end
   end

data/lib/app_generators/taza/taza_generator.rb

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

data/lib/extensions/object.rb

@@ -1,6 +1,10 @@
 # instance_exec comes with >1.8.7 thankfully
 if VERSION <= '1.8.6'
   class Object
+    def metaclass
+      class << self; self; end
+    end
+
     module InstanceExecHelper; end
     include InstanceExecHelper
     # instance_exec method evaluates a block of code relative to the specified object, with parameters whom come from outside the object.
@@ -22,3 +26,8 @@ if VERSION <= '1.8.6'
     end
   end
 end
+class Object
+  def metaclass
+    class << self; self; end
+  end
+end

data/lib/taza.rb

@@ -4,23 +4,12 @@ require 'taza/browser'
 require 'taza/settings'
 require 'taza/flow'
 require 'taza/entity'
-require 'taza/fixture'
+require 'taza/fixtures'
 require 'extensions/object'
 require 'extensions/string'
 require 'extensions/hash'
 require 'extensions/array'
 
-module Taza
-  VERSION = '0.8.1'
-
-  def self.windows?
-    PLATFORM.include?("mswin")  
-  end 
-  def self.osx?
-    PLATFORM.include?("darwin")
-  end
-end
-
 module ForwardInitialization
   module ClassMethods
     def new(*args,&block)

data/lib/taza/entity.rb

@@ -19,14 +19,17 @@ 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.fixture_exists?(key)
+      if @fixture.nil?
+        @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])
+        @fixture.get_fixture_entity(key.pluralize.to_sym,@hash[key])
       else
         @hash[key]
       end
     end
+    alias :[] :get_value_for_entry
 
     private
     def create_method(name, &block) # :nodoc:

data/lib/taza/fixture.rb

@@ -1,17 +1,30 @@
 require 'find'
-require "erb"
+require 'erb'
+require 'extensions/hash'
+require 'taza/entity'
 
 module Taza
+  # The module that will mixin methods based on the fixture files in your 'spec/fixtures'
+  # 
+  # Example:
+  #   describe "something" do
+  #     it "should test something" do
+  #       users(:jane_smith).first_name.should eql("jane")
+  #     end
+  #   end
+  # 
+  #  where there is a spec/fixtures/users.yml file containing a entry of:
+  # jane_smith:
+  #   first_name: jane
+  #   last_name: smith
   class Fixture # :nodoc:
 
     def initialize # :nodoc:
       @fixtures = {}
     end
 
-    def load_all(fixtures_pattern) # :nodoc:
-      index_of_fixtures = fixtures_pattern.index("fixtures")
-      truncated_pattern = fixtures_pattern[index_of_fixtures..-1]
-      Dir.glob(File.join(base_path,truncated_pattern)) do |file|
+    def load_fixtures_from(dir) # :nodoc:
+      Dir.glob(File.join(dir,'*.yml')) do |file|
         templatized_fixture=ERB.new(File.read(file))
         entitized_fixture = {}
         YAML.load(templatized_fixture.result()).each do |key, value|
@@ -34,7 +47,7 @@ module Taza
     end
 
     def pluralized_fixture_exists?(singularized_fixture_name) # :nodoc:
-      fixture_exists?(singularized_fixture_name.pluralize_to_sym)
+      fixture_exists?(singularized_fixture_name.pluralize.to_sym)
     end
     
     def specific_fixture_entities(fixture_key, select_array)
@@ -46,43 +59,10 @@ module Taza
       fixture_names.include?(fixture_name.to_sym)
     end
 
-   def base_path # :nodoc:
-     File.join('.','spec')
+   def self.base_path # :nodoc:
+     File.join('.','spec','fixtures','')
    end
   end
   
-  # The module that will mixin methods based on the fixture files in your 'spec/fixtures'
-  # 
-  # Example:
-  #   describe "something" do
-  #     it "should test something" do
-  #       users(:jane_smith).first_name.should eql("jane")
-  #     end
-  #   end
-  # 
-  #  where there is a spec/fixtures/users.yml file containing a entry of:
-  # jane_smith:
-  #   first_name: jane
-  #   last_name: smith
-    dirs = Dir.glob(File.join(Fixture.new.base_path,"**","**")).select {|d| File.directory?(d) }
-    dirs[0,0] = File.join(Fixture.new.base_path,"fixtures")
-    dirs.each do |mod|
-      base_module = mod == dirs[0] ? "" : "Fixtures::"
-      self.class_eval <<-EOS
-      module #{base_module}#{mod.split('/')[-1].camelize}
-        def self.included(other_module) 
-          fixture = Fixture.new
-          fixture.load_all(File.join("#{mod}","*.yml"))
-          fixture.fixture_names.each do |fixture_name|
-            self.class_eval do
-              define_method(fixture_name) do |entity_key|
-                fixture.get_fixture_entity(fixture_name,entity_key.to_s)
-              end
-            end
-          end
-        end
-      end
-      EOS
-   end
 end
 

data/lib/taza/fixtures.rb

@@ -0,0 +1,24 @@
+require 'taza/fixture'
+
+module Taza
+  dirs = Dir.glob(File.join(Fixture.base_path,'*/'))
+  dirs.unshift Fixture.base_path
+  dirs.each do |dir|
+    mod = dir.sub(Fixture.base_path,File.join(File.basename(Fixture.base_path),'')).camelize.sub(/::$/,'')
+    self.class_eval <<-EOS
+      module #{mod}
+        def self.included(other_module) 
+          fixture = Fixture.new
+          fixture.load_fixtures_from('#{dir}')
+          fixture.fixture_names.each do |fixture_name|
+            self.class_eval do
+              define_method(fixture_name) do |entity_key|
+                fixture.get_fixture_entity(fixture_name,entity_key.to_s)
+              end
+            end
+          end
+        end
+      end
+      EOS
+  end
+end

data/lib/taza/page.rb

@@ -32,7 +32,12 @@ module Taza
     #   end
     # homepage.foo.click
     def self.element(name,&block)
-      self.elements[name] = block
+      if !@module.nil?
+        self.elements[@module] = Hash.new if self.elements[@module].nil?
+        self.elements[@module] = self.elements[@module].merge({ name => block })
+      else
+        self.elements[name] = block
+      end
     end
 
     # A filter for elemenet(s) on a page
@@ -64,20 +69,33 @@ module Taza
       end
     end
 
-    def initialize
-      add_element_methods
+    def self.page_module(name,&block)
+      @module = name
+      yield(block)
+      @module = nil
+    end
+
+    def initialize(page_module = nil)
+      add_element_methods(page_module)
       @active_filters = []
     end
 
-    def add_element_methods # :nodoc:
+    def add_element_methods(page_module = nil) # :nodoc:
       self.class.elements.each do |element_name,element_block|
-        filters = self.class.filters[element_name] + self.class.filters[:all]
-        add_element_method(:filters => filters, :element_name => element_name, :element_block => 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]
+            add_element_method(:filters => filters, :element_name => key, :element_block => value)
+          end
+        else
+          filters = self.class.filters[element_name] + self.class.filters[:all]
+          add_element_method(:filters => filters, :element_name => element_name, :element_block => element_block)
+        end
       end
     end
 
     def add_element_method(params) # :nodoc:
-      self.class.class_eval do
+      metaclass.class_eval do
         define_method(params[:element_name]) do |*args|
           check_filters(params)
           self.instance_exec(*args,&params[:element_block])

data/lib/taza/site.rb

@@ -93,8 +93,8 @@ module Taza
         page_name = File.basename(file,'.rb')
         page_class = "#{@module_name}::#{page_name.camelize}"
         self.class.class_eval <<-EOS
-        def #{page_name}
-          page = '#{page_class}'.constantize.new
+        def #{page_name}(page_module = nil)
+          page = '#{page_class}'.constantize.new(page_module)
           page.browser = @browser
           yield page if block_given?
           page

data/lib/taza/tasks.rb

@@ -31,19 +31,24 @@ module Taza
           end
         end
       end
+
       def recurse_to_create_rake_tasks(dir)
         basename = File.basename(dir)
-        define_spec_task(basename,File.join(dir,"**","*_spec.rb"))
-        namespace basename do
-          Dir.glob(File.join(dir,"*_spec.rb")).each do |spec_file|
-            spec_name = File.basename(spec_file,'_spec.rb')
-            define_spec_task(spec_name,spec_file)
-          end
-          Dir.glob(File.join(dir,"*/")).each do |sub_dir|
-            recurse_to_create_rake_tasks(sub_dir)
+        spec_pattern = File.join(dir,"**","*_spec.rb")
+        if (not Dir.glob(spec_pattern).empty?)
+          define_spec_task(basename,spec_pattern)
+          namespace basename do
+            Dir.glob(File.join(dir,"*_spec.rb")).each do |spec_file|
+              spec_name = File.basename(spec_file,'_spec.rb')
+              define_spec_task(spec_name,spec_file)
+            end
+            Dir.glob(File.join(dir,"*/")).each do |sub_dir|
+              recurse_to_create_rake_tasks(sub_dir)
+            end
           end
         end
       end
+
     end
   end
 end

data/spec/array_spec.rb

@@ -1,4 +1,5 @@
 require 'spec/spec_helper'
+require 'extensions/array'
 
 describe 'Array Extensions' do
   it "should know if elements are not equivilent to a subset of those elements" do
@@ -13,4 +14,4 @@ describe 'Array Extensions' do
   it "should know it is equivalent if the different orders" do
     [1,2,3].should be_equivalent([2,1,3])
   end
-end
+end

data/spec/entity_spec.rb

@@ -1,9 +1,15 @@
 require 'spec/spec_helper'
-require 'taza'
+require 'taza/entity'
 
 describe Taza::Entity do
   it "should add methods for hash string keys" do
     entity = Taza::Entity.new({'apple' => 'pie'},nil)
     entity.should respond_to(:apple)
   end
-end
+
+  it "should be accessible like a hash(foo[:bar])" do
+    entity = Taza::Entity.new({:apple => 'pie'},nil)
+    entity[:apple].should eql('pie')
+  end
+
+end

data/spec/fixture_spec.rb

@@ -1,56 +1,48 @@
 require 'spec/spec_helper'
-require 'taza'
+require 'taza/fixture'
+require 'extensions/array'
 
 describe Taza::Fixture do
-  
+  before :each do
+    @base_path = File.join('.','spec','sandbox','fixtures','')
+  end
+
   it "should be able to load entries from fixtures" do
-    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all(File.join('fixtures','*.yml'))
+    fixture.load_fixtures_from(@base_path)
     example = fixture.get_fixture_entity(:examples,'first_example')
     example.name.should eql("first")
     example.price.should eql(1)
   end
 
-  it "should use the spec folder as the base path" do
-    Taza::Fixture.new.base_path.should eql('./spec')
+  it "should use the spec fixtures folder as the base path" do
+    Taza::Fixture.base_path.should eql('./spec/fixtures/')
   end
 
   it "should know if a pluralized fixture of that name exists" do
-    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all(File.join('fixtures','*.yml'))
+    fixture.load_fixtures_from(@base_path)
     fixture.pluralized_fixture_exists?('example').should be_true
     fixture.pluralized_fixture_exists?('boo').should be_false
   end
   
   it "should be able to get all fixtures loaded excluding sub-folder fixtures" do
-    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all(File.join('fixtures','*.yml'))
+    fixture.load_fixtures_from(@base_path)
     fixture.fixture_names.should be_equivalent([:examples,:users,:foos])
   end
   
-  it "should be able to get all fixtures loaded including sub-folder fixtures" do
-    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
-    fixture = Taza::Fixture.new
-    fixture.load_all(File.join('fixtures','**','*.yml'))
-    fixture.fixture_names.should be_equivalent([:examples,:users,:foos,:bars])
-  end
-
   it "should be able to get specific fixture entities" do
-    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all(File.join('fixtures','*.yml'))
+    fixture.load_fixtures_from(@base_path)
     examples = fixture.specific_fixture_entities(:examples, ['third_example'])
     examples.length.should eql(1)
     examples['third_example'].name.should eql('third')
   end
 
   it "should not modified the fixtures when you get specific entities off a fixture" do
-    Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')
     fixture = Taza::Fixture.new
-    fixture.load_all(File.join('fixtures','*.yml'))
+    fixture.load_fixtures_from(@base_path)
     previous_count = fixture.get_fixture(:examples).length
     examples = fixture.specific_fixture_entities(:examples, ['third_example'])
     fixture.get_fixture(:examples).length.should eql(previous_count)

data/spec/fixtures_spec.rb

@@ -1,8 +1,9 @@
 require 'spec/spec_helper'
 require 'taza/fixture'
 
-describe Taza::Fixtures do
-  Taza::Fixture.any_instance.stubs(:base_path).returns('./spec/sandbox')  
+describe "Taza::Fixtures" do
+  Taza::Fixture.stubs(:base_path).returns('./spec/sandbox/fixtures/')  
+  require 'taza/fixtures'
   include Taza::Fixtures
   
   it "should be able to look up a fixture entity off fixture_methods module" do
@@ -35,4 +36,8 @@ describe Taza::Fixtures do
     users(:shatner).age.should eql(66)
   end
 
+  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
+
 end

data/spec/flow_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 require 'rubygems'
 require 'fileutils'
-require 'taza'
+require 'taza/site'
 
 class Taza::Site
   def flows

data/spec/hash_spec.rb

@@ -1,5 +1,8 @@
 require 'spec/spec_helper'
+require 'taza/entity'
+require 'extensions/hash'
 
+# This is too tightly coupled to Taza::Entity
 describe 'Hash Extensions' do
   it "should add methods for hash keys to some instance" do
     entity = {'apple' => 'pie'}.convert_hash_keys_to_methods(nil)
@@ -9,4 +12,4 @@ describe 'Hash Extensions' do
     entity = {'apple' => 'pie'}.convert_hash_keys_to_methods(nil)
     entity.should_not be_a_instance_of(Hash)
   end
-end
+end

data/spec/page_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 require 'rubygems'
 require 'fileutils'
-require 'taza'
+require 'taza/page'
 
 describe "Page Generation" do
   include RubiGen::GeneratorTestHelper
@@ -34,7 +34,7 @@ describe "Page Generation" do
 
   it "should generate a page spec that can be required" do
     run_generator('page', [@page_name,@site_class.to_s], generator_sources)
-    page_functional_spec = File.join(PROJECT_FOLDER,'spec','functional',@site_class.to_s.underscore,'check_out_page_spec.rb')
+    page_functional_spec = File.join(PROJECT_FOLDER,'spec','isolation',@site_class.to_s.underscore,'check_out_page_spec.rb')
     system("ruby -c #{page_functional_spec} > #{null_device}").should be_true
   end
 

data/spec/page_module_spec.rb

@@ -0,0 +1,104 @@
+require 'spec/spec_helper'
+require 'taza/page'
+
+describe "Taza Page Module" do
+
+  class PageWithModule < ::Taza::Page
+
+    page_module :module do
+      element(:module_element) { browser }
+    end
+
+  end
+
+  it "should execute elements in the context of their page module" do
+    page = PageWithModule.new(:module)
+    page.browser = :something
+    page.module_element.should eql(:something)
+  end
+
+  class AnotherPageWithModule < ::Taza::Page
+
+    page_module :other_module do
+      element(:another_module_element) { browser }
+    end
+
+  end
+
+
+  it "should not execute elements that belong to a page module but accessed without it" do
+    lambda { AnotherPageWithModule.new.another_module_element }.should raise_error(NoMethodError)
+  end
+
+  it "should execute elements in the context of their page module when accessed with it" do
+    page = AnotherPageWithModule.new(:other_module)
+    page.browser = :another_thing
+    page.another_module_element.should eql(:another_thing)
+  end
+
+
+  class TestPageWithModules < ::Taza::Page
+
+    page_module :module_one do
+      element(:some_module_element) { :something }
+    end
+
+    page_module :module_two do
+      element(:some_module_element) { :nothing }
+    end
+
+  end
+
+  it "should execute elements with the same name but different page modules" do
+    module_one = TestPageWithModules.new(:module_one)
+    module_two = TestPageWithModules.new(:module_two)
+    module_one.some_module_element.should eql(:something)
+    module_two.some_module_element.should eql(:nothing)
+  end
+
+  class PageWithMultipleModuleElements < ::Taza::Page
+
+    page_module :module do
+      element(:module_element) { :something }
+      element(:another_module_element) { :nothing }
+    end
+
+  end
+
+  it "should execute elements with the same name but different page modules" do
+    page_module = PageWithMultipleModuleElements.new(:module)
+    page_module.module_element.should eql(:something)
+    page_module.another_module_element.should eql(:nothing)
+  end
+
+  class PageWithFilterAndModule < ::Taza::Page
+    page_module :module do
+      element(:sample_element) {:something}
+    end
+    filter :sample_filter, :module
+    def sample_filter
+      true
+    end
+  end
+
+  it "should execute filters for page modules" do
+    page = PageWithFilterAndModule.new(:module)
+    page.sample_element.should eql(:something)
+  end
+
+ class PageWithFalseFilterAndModule < ::Taza::Page
+    page_module :module do
+      element(:sample_element) {:something}
+    end
+    filter :false_filter, :module
+    def false_filter
+      false
+    end
+  end
+
+  it "should raise an error for page-module filters that return false" do
+    page = PageWithFalseFilterAndModule.new(:module)
+    lambda { page.sample_element }.should raise_error(Taza::FilterError)
+  end
+
+end

data/spec/partial_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 require 'rubygems'
 require 'fileutils'
-require 'taza'
+require 'taza/page'
 
 describe "Partial Generation" do
   include RubiGen::GeneratorTestHelper

data/spec/project_generator_spec.rb

@@ -2,7 +2,6 @@ require 'spec/spec_helper'
 require 'rubygems'
 require 'rake'
 require 'fileutils'
-require 'taza'
 
 describe "Project Generator" do
   include RubiGen::GeneratorTestHelper

data/spec/sandbox/pages/foo/bay.rb

@@ -0,0 +1,10 @@
+class Baz < Taza::Page
+  page_module :another_module do
+    element(:some_element) { :another_some_element_value }
+  end
+
+  filter :bay, :another_module
+  def bay
+    true
+  end
+end

data/spec/sandbox/pages/foo/baz.rb

@@ -0,0 +1,11 @@
+class Baz < Taza::Page
+  page_module :module do
+    element(:some_element) { :some_element_value }
+    element(:other_element) { :other_element_value }
+  end
+
+  filter :boo, :module
+  def boo
+    true
+  end
+end

data/spec/settings_spec.rb

@@ -1,88 +1,89 @@
-require 'spec/spec_helper'
-require 'rubygems'
-require 'taza'
-
-describe Taza::Settings do
-  
-  before :all do
-    @site_name = 'SiteName'
-  end
-  
-  before :each do
-    ENV['TAZA_ENV'] = 'isolation'
-    ENV['BROWSER'] = nil
-    ENV['DRIVER'] = nil
-  end
-
-  it "should use environment variable for browser settings" do
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    ENV['BROWSER'] = 'foo'
-    Taza::Settings.config(@site_name)[:browser].should eql(:foo)
-  end
-  
-  it "should provide default values if no config file or environment settings provided" do
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.config(@site_name)[:driver].should eql(:selenium)
-    Taza::Settings.config(@site_name)[:browser].should eql(:firefox)
-  end
-  
-  it "should use environment variable for driver settings" do
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    ENV['DRIVER'] = 'bar'
-    Taza::Settings.config(@site_name)[:driver].should eql(:bar)
-  end
-  
-  it "should be able to load the site yml" do
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.config("SiteName")[:url].should eql('http://google.com')
-  end
-
-  it "should be able to load a alternate site url" do
-    ENV['TAZA_ENV'] = 'clown_shoes'
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.config("SiteName")[:url].should eql('http://clownshoes.com')
-  end
-
-  it "should use the config file's variable for browser settings if no environment variable is set" do
-    Taza::Settings.expects(:config_file).returns({:browser => :fu})
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.config(@site_name)[:browser].should eql(:fu)
-  end
-
-  it "should use the ENV variables if specfied instead of config files" do
-    ENV['BROWSER'] = 'opera'
-    Taza::Settings.expects(:config_file).returns({:browser => :fu})
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.config(@site_name)[:browser].should eql(:opera)
-  end
-
-  it "should use the correct config file to set defaults" do
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.stubs(:config_file_path).returns('spec/sandbox/config.yml')
-  end
-  
-  it "should raise error for a config file that doesnot exist" do
-    Taza::Settings.stubs(:path).returns('spec/sandbox/file_not_exists.yml')
-    lambda {Taza::Settings.config}.should raise_error
-  end
-  
-  it "should path point at root directory" do
-    Taza::Settings.path.should eql('.')
-  end
-  
-  it "should use the config file's variable for driver settings if no environment variable is set" do
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.stubs(:config_file).returns({:driver => :fun})
-    Taza::Settings.config(@site_name)[:driver].should eql(:fun)    
-  end
-
-  class SiteName < Taza::Site
-
-  end
-
-  it "a site should be able to load its settings" do
-    Taza::Settings.stubs(:path).returns("spec/sandbox")
-    SiteName.settings[:url].should eql('http://google.com')
-  end
-
-end
+require 'spec/spec_helper'
+require 'rubygems'
+require 'taza/settings'
+require 'taza/site'
+
+describe Taza::Settings do
+
+  before :all do
+    @site_name = 'SiteName'
+  end
+
+  before :each do
+    ENV['TAZA_ENV'] = 'isolation'
+    ENV['BROWSER'] = nil
+    ENV['DRIVER'] = nil
+  end
+
+  it "should use environment variable for browser settings" do
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    ENV['BROWSER'] = 'foo'
+    Taza::Settings.config(@site_name)[:browser].should eql(:foo)
+  end
+
+  it "should provide default values if no config file or environment settings provided" do
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    Taza::Settings.config(@site_name)[:driver].should eql(:selenium)
+    Taza::Settings.config(@site_name)[:browser].should eql(:firefox)
+  end
+
+  it "should use environment variable for driver settings" do
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    ENV['DRIVER'] = 'bar'
+    Taza::Settings.config(@site_name)[:driver].should eql(:bar)
+  end
+
+  it "should be able to load the site yml" do
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    Taza::Settings.config("SiteName")[:url].should eql('http://google.com')
+  end
+
+  it "should be able to load a alternate site url" do
+    ENV['TAZA_ENV'] = 'clown_shoes'
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    Taza::Settings.config("SiteName")[:url].should eql('http://clownshoes.com')
+  end
+
+  it "should use the config file's variable for browser settings if no environment variable is set" do
+    Taza::Settings.expects(:config_file).returns({:browser => :fu})
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    Taza::Settings.config(@site_name)[:browser].should eql(:fu)
+  end
+
+  it "should use the ENV variables if specfied instead of config files" do
+    ENV['BROWSER'] = 'opera'
+    Taza::Settings.expects(:config_file).returns({:browser => :fu})
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    Taza::Settings.config(@site_name)[:browser].should eql(:opera)
+  end
+
+  it "should use the correct config file to set defaults" do
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    Taza::Settings.stubs(:config_file_path).returns('spec/sandbox/config.yml')
+  end
+
+  it "should raise error for a config file that doesnot exist" do
+    Taza::Settings.stubs(:path).returns('spec/sandbox/file_not_exists.yml')
+    lambda {Taza::Settings.config}.should raise_error
+  end
+
+  it "should path point at root directory" do
+    Taza::Settings.path.should eql('.')
+  end
+
+  it "should use the config file's variable for driver settings if no environment variable is set" do
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    Taza::Settings.stubs(:config_file).returns({:driver => :fun})
+    Taza::Settings.config(@site_name)[:driver].should eql(:fun)
+  end
+
+  class SiteName < Taza::Site
+
+  end
+
+  it "a site should be able to load its settings" do
+    Taza::Settings.stubs(:path).returns("spec/sandbox")
+    SiteName.settings[:url].should eql('http://google.com')
+  end
+
+end

data/spec/site_fixtures_spec.rb

@@ -1,15 +1,17 @@
-require 'spec/spec_helper'
-require 'taza/fixture'
-
-describe "Site Specific Fixtures" do
-  include Taza::Fixtures::FooSite
- 
-  it "should be able to access fixtures in sub-folders" do
-    bars(:foo).name.should eql("foo")
-  end
-
-  it "should not be able to access non-site-specific fixtures" do
-    lambda{foos(:gap)}.should raise_error(NoMethodError)
-  end
-
-end
+require 'spec/spec_helper'
+require 'taza/fixture'
+
+describe "Site Specific Fixtures" do
+  Taza::Fixture.stubs(:base_path).returns(File.join('.','spec','sandbox','fixtures',''))
+  require 'taza/fixtures'
+  include Taza::Fixtures::FooSite
+
+  it "should be able to access fixtures in sub-folders" do
+    bars(:foo).name.should eql("foo")
+  end
+
+  it "should not be able to access non-site-specific fixtures" do
+    lambda{foos(:gap)}.should raise_error(NoMethodError)
+  end
+
+end

data/spec/site_generator_spec.rb

@@ -1,7 +1,6 @@
 require 'spec/spec_helper'
 require 'rubygems'
 require 'fileutils'
-require 'taza'
 
 describe "Site Generation" do
   include RubiGen::GeneratorTestHelper
@@ -39,9 +38,9 @@ describe "Site Generation" do
     File.directory?(File.join(@site_folder,"pages","partials")).should be_true
   end
 
-  it "should generate a folder for a sites functional tests" do
+  it "should generate a folder for a sites isolation tests" do
     run_generator('site', [@site_name], generator_sources)
-    File.directory?(File.join(PROJECT_FOLDER,'spec','functional','wikipedia_foo')).should be_true
+    File.directory?(File.join(PROJECT_FOLDER,'spec','isolation','wikipedia_foo')).should be_true
   end
   
   it "generated site that uses the block given in new" do

data/spec/site_spec.rb

@@ -1,6 +1,10 @@
 require 'spec/spec_helper'
 require 'rubygems'
-require 'taza'
+require 'taza/site'
+require 'taza/settings'
+require 'taza/browser'
+require 'taza/page'
+require 'taza/flow'
 
 describe Taza::Site do
 
@@ -226,4 +230,23 @@ describe Taza::Site do
     browser
   end
 
+  it "should yield an instance of page class that can access page-module specific elements" do
+    f = Foo.new(:browser => stub_browser)
+    barzor = nil
+    f.baz(:module) do |baz|
+      barzor = baz
+    end
+    barzor.should be_an_instance_of(Baz)
+    barzor.some_element.should eql(:some_element_value)
+  end
+
+  it "should raise an error when accessing an element taht belongs to another module" do
+    f = Foo.new(:browser => stub_browser)
+    barzor = nil
+    f.baz(:another_module) do |baz|
+      barzor = baz
+    end
+    lambda{barzor.other_element}.should raise_error(NoMethodError)
+  end
+
 end

data/spec/string_spec.rb

@@ -1,4 +1,5 @@
 require 'spec/spec_helper'
+require 'extensions/string'
 
 describe "string extensions" do
   it "should pluralize and to sym a string" do

data/spec/taza_bin_spec.rb

@@ -1,7 +1,6 @@
 require 'spec/spec_helper'
 require 'rubygems'
 require 'fileutils'
-require 'taza'
 
 describe "Taza project generator script" do
 

data/spec/taza_tasks_spec.rb

@@ -13,13 +13,18 @@ describe "Taza Tasks" do
 
   before :each do
     Dir.stubs(:taglob).returns([])
-    Dir.expects(:glob).with('./spec/*/').returns(['./spec/functional/'])
+    Dir.expects(:glob).with('./spec/*/').returns(['./spec/functional/','./spec/mocks/'])
     Dir.expects(:glob).with('./spec/functional/*/').returns(['./spec/functional/foo/'])
     Dir.expects(:glob).with('./spec/functional/*_spec.rb').returns([])
     Dir.expects(:glob).with('./spec/functional/foo/*/').returns(['./spec/functional/foo/page/'])
     Dir.expects(:glob).with('./spec/functional/foo/*_spec.rb').returns([])
     Dir.expects(:glob).with('./spec/functional/foo/page/*/').returns([])
     Dir.expects(:glob).with('./spec/functional/foo/page/*_spec.rb').returns(['./spec/functional/foo/page/bar_spec.rb'])
+
+    Dir.expects(:glob).with('./spec/functional/**/*_spec.rb').returns(['./spec/functional/foo/page/bar_spec.rb'])
+    Dir.expects(:glob).with('./spec/functional/foo/**/*_spec.rb').returns(['./spec/functional/foo/page/bar_spec.rb'])
+    Dir.expects(:glob).with('./spec/functional/foo/page/**/*_spec.rb').returns(['./spec/functional/foo/page/bar_spec.rb'])
+    Dir.expects(:glob).with('./spec/mocks/**/*_spec.rb').returns([])
     load @file_name
     Taza::Rake::Tasks.new
   end
@@ -40,6 +45,10 @@ describe "Taza Tasks" do
     tasks.include?("spec:functional:foo:page:bar").should be_true
   end
 
+  it "should not create rake spec tasks for folders that donot contain specs in their sub-tree" do
+    tasks.include?("spec:mocks").should be_false
+  end
+
   def tasks
     @rake.tasks.collect{|task| task.name }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taza
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Adam Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-16 00:00:00 -08:00
+date: 2009-03-05 00:00:00 -08:00
 default_executable: taza
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - lib/taza/browser.rb
 - lib/taza/entity.rb
 - lib/taza/fixture.rb
+- lib/taza/fixtures.rb
 - lib/taza/flow.rb
 - lib/taza/page.rb
 - lib/taza/settings.rb
@@ -127,6 +128,7 @@ files:
 - 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/project_generator_spec.rb
@@ -147,6 +149,8 @@ files:
 - 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
@@ -156,7 +160,6 @@ files:
 - spec/spec_helper.rb
 - spec/string_spec.rb
 - spec/taza_bin_spec.rb
-- spec/taza_spec.rb
 - spec/taza_tasks_spec.rb
 - README
 has_rdoc: true

data/spec/taza_spec.rb

@@ -1,12 +0,0 @@
-require 'spec/spec_helper'
-require 'rubygems'
-
-describe "Taza GIVE ME 100% COVERAGE LOL" do
-  it "should cover the windows method" do
-    Taza.windows?
-  end
-
-  it "should cover the osx method" do
-    Taza.osx?
-  end
-end