taza 0.8.7 → 0.9.0

data/spec/array_spec.rb

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

data/spec/browser_spec.rb

@@ -1,9 +1,4 @@
-require 'spec/spec_helper'
-require 'taza/browser'
-require 'taza/settings'
-require 'taza/options'
-require 'selenium'
-require 'watir'
+require 'spec_helper'
 
 describe Taza::Browser do
 
@@ -26,11 +21,16 @@ describe Taza::Browser do
     Selenium::SeleniumDriver.expects(:new).with(anything,anything,'*opera',anything)
     Taza::Browser.create(:browser => browser_type, :driver => :selenium)
   end
-  
+
   it "should raise selenium unsupported browser error" do
     Taza::Browser.create(:browser => :foo, :driver => :selenium)
   end
 
+  it "should use params browser type when creating an watir webdriver instance" do
+    Watir::Browser.expects(:new).with(:firefox)
+    browser = Taza::Browser.create(:browser => :firefox, :driver => :watir_webdriver)
+  end
+
   it "should be able to create a selenium instance" do
     browser = Taza::Browser.create(:browser => :firefox, :driver => :selenium)
     browser.should be_a_kind_of(Selenium::SeleniumDriver)
@@ -53,34 +53,7 @@ describe Taza::Browser do
 
   it "should be able to give you the class of browser" do
     Taza::Browser.expects(:watir_safari).returns(Object)
-    Taza::Browser.browser_class(:browser => :safari, :driver => :watir).should eql(Object) 
-  end
-  
-  it "should be able to attach to an open IE instance" do
-    require 'watir'
-    browser = Object.new
-    Watir::IE.stubs(:find).returns(browser)
-    Watir::IE.stubs(:new).returns(browser)
-    old_browser = Watir::IE.new
-    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir, :attach => true) 
-    new_browser.should eql(old_browser)
-  end
-  
-  it "should be able to open a new IE instance if there is no instance to attach to" do
-    require 'watir'
-    browser = Object.new
-    Watir::IE.stubs(:find).returns()
-    Watir::IE.stubs(:new).returns(browser)
-    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir) 
-    browser.nil?.should be_false 
-  end
-  it "should be able to open a new IE instance if attach not specified" do
-    require 'watir'
-    foo = Object.new
-    bar = Object.new
-    Watir::IE.stubs(:find).returns(foo)
-    Watir::IE.stubs(:new).returns(bar)
-    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir) 
-    new_browser.should_not eql(foo)
+    Taza::Browser.browser_class(:browser => :safari, :driver => :watir).should eql(Object)
   end
+
 end

data/spec/entity_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'taza/entity'
 
 describe Taza::Entity do
@@ -21,7 +21,7 @@ describe Taza::Entity do
     entity = Taza::Entity.new({:apple => 'pie' },nil)
     entity.to_hash[:apple].should eql('pie')
   end
-  
+
   it "should be able to do string-to-symbol conversion for hash keys using to_hash" do
     entity = Taza::Entity.new({'apple' => 'pie' },nil)
     entity.to_hash[:apple].should eql('pie')

data/spec/fixture_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'taza/fixture'
 require 'extensions/array'
 
@@ -25,13 +25,13 @@ describe Taza::Fixture do
     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
     fixture = Taza::Fixture.new
     fixture.load_fixtures_from(@base_path)
     fixture.fixture_names.should be_equivalent([:examples,:users,:foos])
   end
-  
+
   it "should be able to get specific fixture entities" do
     fixture = Taza::Fixture.new
     fixture.load_fixtures_from(@base_path)

data/spec/fixtures_spec.rb

@@ -1,28 +1,29 @@
-require 'spec/spec_helper'
-require 'taza/fixture'
+require 'spec_helper'
+
 
 describe "Taza::Fixtures" do
-  Taza::Fixture.stubs(:base_path).returns('./spec/sandbox/fixtures/')  
-  require 'taza/fixtures'
+
+  Taza::Fixture.stubs(:base_path).returns('./spec/sandbox/fixtures/')
+  Taza.load_fixtures
   include Taza::Fixtures
-  
+
   it "should be able to look up a fixture entity off fixture_methods module" do
     examples(:first_example).name.should eql('first')
   end
-  
+
   it "should still raise method missing error" do
     lambda{zomgwtf(:first_example)}.should raise_error(NoMethodError)
   end
-  
+
   #TODO: this test tests what is in entity's instance eval not happy with it being here
   it "should be able to look up a fixture entity off fixture_methods module" do
     examples(:first_example).user.name.should eql(users(:shatner).name)
   end
-  
+
   it "should be able to resolve one to many relationships" do
     foos(:gap).examples.length.should eql(2)
   end
-  
+
   it "should be able to get one to many entities" do
     foos(:gap).examples['first_example'].name.should eql('first')
     foos(:gap).examples['second_example'].name.should eql('second')
@@ -39,9 +40,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') 
+    examples(:forth_example).something.user.name.should eql('William Shatner')
   end
 
 end

data/spec/flow_generator_spec.rb

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

data/spec/hash_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'taza/entity'
 require 'extensions/hash'
 

data/spec/page_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'rubygems'
 require 'fileutils'
 require 'taza/page'
@@ -20,7 +20,7 @@ describe "Page Generation" do
   after :each do
     bare_teardown
   end
-  
+
   it "should give you usage if you do not give two arguments" do
     PageGenerator.any_instance.expects(:usage)
     lambda { run_generator('page', [@page_name], generator_sources) }.should raise_error

data/spec/page_module_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'taza/page'
 
 describe "Taza Page Module" do
@@ -136,7 +136,7 @@ describe "Taza Page Module" do
     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}

data/spec/page_spec.rb

@@ -1,8 +1,8 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'taza/page'
 
 describe Taza::Page do
-  
+
   class ElementAndFilterContextExample < Taza::Page
     element(:sample_element) {browser}
     filter:sample_filter, :sample_element
@@ -29,17 +29,17 @@ describe Taza::Page do
     Taza::Page.element(:boo){|baz| baz}
     Taza::Page.new.boo("rofl").should == "rofl"
   end
-  
+
   it "should execute elements and filters in the context of the page instance" do
     page = ElementAndFilterContextExample.new
     page.browser = :something
     page.sample_element.should eql(:something)
   end
-  
+
   it "should add a filter to the classes filters" do
-    ElementAndFilterContextExample.filters.size.should eql(1) 
+    ElementAndFilterContextExample.filters.size.should eql(1)
   end
-  
+
   it "should store the block given to the element method in a method with the name of the parameter" do
     Taza::Page.element(:foo) do
       "bar"
@@ -56,12 +56,12 @@ describe Taza::Page do
       false
     end
   end
-    
+
   it "should filter all elements if element argument is not provided" do
     lambda { FilterAllElements.new.apple }.should raise_error(Taza::FilterError)
     lambda { FilterAllElements.new.foo }.should raise_error(Taza::FilterError)
   end
-  
+
   it "should have empty elements on a new class" do
     foo = Class::new(superclass=Taza::Page)
     foo.elements.should_not be_nil
@@ -87,7 +87,7 @@ describe Taza::Page do
   it "should raise a error if an elements is called and its filter returns false" do
     lambda { FilterAnElement.new.false_item }.should raise_error(Taza::FilterError)
   end
-  
+
   it "should not call element block if filters fail" do
     page = FilterAnElement.new
     lambda { page.false_item }.should raise_error

data/spec/partial_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'rubygems'
 require 'fileutils'
 require 'taza/page'

data/spec/platform/windows/browser_win.rb

@@ -0,0 +1,47 @@
+require 'spec/spec_helper'
+require 'taza/browser'
+require 'taza/settings'
+require 'taza/options'
+require 'selenium'
+require 'watir'
+
+describe Taza::Browser do
+
+  before :each do
+    Taza::Settings.stubs(:config_file).returns({})
+    ENV['TAZA_ENV'] = 'isolation'
+    ENV['SERVER_PORT'] = nil
+    ENV['SERVER_IP'] = nil
+    ENV['BROWSER'] = nil
+    ENV['DRIVER'] = nil
+    ENV['TIMEOUT'] = nil
+  end
+  it "should be able to attach to an open IE instance" do
+    require 'watir'
+    browser = Object.new
+    Watir::IE.stubs(:find).returns(browser)
+    Watir::IE.stubs(:new).returns(browser)
+    old_browser = Watir::IE.new
+    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir, :attach => true) 
+    new_browser.should eql(old_browser)
+  end
+  
+  it "should be able to open a new IE instance if there is no instance to attach to" do
+    require 'watir'
+    browser = Object.new
+    Watir::IE.stubs(:find).returns()
+    Watir::IE.stubs(:new).returns(browser)
+    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir) 
+    browser.nil?.should be_false 
+  end
+  it "should be able to open a new IE instance if attach not specified" do
+    require 'watir'
+    foo = Object.new
+    bar = Object.new
+    Watir::IE.stubs(:find).returns(foo)
+    Watir::IE.stubs(:new).returns(bar)
+    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir) 
+    new_browser.should_not eql(foo)
+  end
+
+end

data/spec/project_generator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'rubygems'
 require 'rake'
 require 'fileutils'
@@ -29,20 +29,6 @@ describe "Project Generator" do
     system("ruby -c #{@spec_helper} > #{null_device}").should be_true
   end
 
-  it "spec helper should set the TAZA_ENV variable if it is not provided" do
-    ENV['TAZA_ENV'] = nil
-    run_generator('taza', [APP_ROOT], generator_sources)
-    load @spec_helper
-    ENV['TAZA_ENV'].should eql("isolation")
-  end
-  
-  it "spec helper should not override the TAZA_ENV variable if was provided" do
-    ENV['TAZA_ENV'] = 'orange pie? is there such a thing?'
-    run_generator('taza', [APP_ROOT], generator_sources)
-    load @spec_helper
-    ENV['TAZA_ENV'].should eql('orange pie? is there such a thing?')
-  end
-
   it "should generate a console script" do
     run_generator('taza', [APP_ROOT], generator_sources)
     File.exists?(File.join(APP_ROOT,'script','console')).should be_true

data/spec/settings_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'rubygems'
 require 'taza/settings'
 require 'taza/options'

data/spec/site_fixtures_spec.rb

@@ -1,9 +1,7 @@
-require 'spec/spec_helper'
-require 'taza/fixture'
-
+require 'spec_helper'
 describe "Site Specific Fixtures" do
   Taza::Fixture.stubs(:base_path).returns(File.join('.','spec','sandbox','fixtures',''))
-  require 'taza/fixtures'
+  Taza.load_fixtures
   include Taza::Fixtures::FooSite
 
   it "should be able to access fixtures in sub-folders" do
@@ -13,5 +11,4 @@ describe "Site Specific Fixtures" do
   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,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'rubygems'
 require 'fileutils'
 
@@ -6,7 +6,7 @@ describe "Site Generation" do
   include RubiGen::GeneratorTestHelper
   include Helpers::Generator
   include Helpers::Taza
-  
+
   before :all do
     @spec_helper = File.join(TMP_ROOT,PROJECT_NAME,'spec','spec_helper.rb')
     @site_name = "WikipediaFoo"
@@ -42,7 +42,7 @@ describe "Site Generation" do
     run_generator('site', [@site_name], generator_sources)
     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
     @site_class = generate_site(@site_name)
     stub_settings

data/spec/site_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'rubygems'
 require 'taza/site'
 require 'taza/settings'
@@ -205,12 +205,12 @@ describe Taza::Site do
     Foo.new() {}
   end
 
-    
+
   module Zoro
     class Zoro < ::Taza::Site
     end
   end
-    
+
   it "should pass in the class name to settings config" do
     browser = stub()
     browser.stubs(:goto)
@@ -218,12 +218,12 @@ describe Taza::Site do
     Taza::Settings.expects(:config).with('Zoro').returns({})
     Zoro::Zoro.new
   end
-  
+
   it "should load settings based on the sites class name" do
     Taza::Settings.expects(:site_file).with('Zoro').returns({})
     Zoro::Zoro.settings
   end
-  
+
   def stub_browser
     browser = stub()
     browser.stubs(:close)
@@ -257,7 +257,7 @@ describe Taza::Site do
     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