scudco-taza 0.8.6 → 0.8.7

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.8.7
+
+* Added script/console Utility
+* Integration with user_choices
+* Attach to open IE instance
+
 === 0.8.6
 
 * Added feature to keep browser open after tests

data/VERSION.yml

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

data/lib/app_generators/taza/taza_generator.rb

@@ -24,6 +24,8 @@ class TazaGenerator < RubiGen::Base
       m.template "spec_helper.rb.erb", File.join("spec","spec_helper.rb")
       m.dependency "install_rubigen_scripts", [destination_root, 'taza'],
         :shebang => options[:shebang], :collision => :force
+      m.template "console.erb", File.join("script","console")
+      m.template "console.cmd.erb", File.join("script","console.cmd")
     end
   end
 
@@ -33,6 +35,7 @@ class TazaGenerator < RubiGen::Base
     m.directory File.join('spec','isolation')
     m.directory File.join('spec','integration')
     m.directory File.join('spec','story')
+    m.directory 'script'
   end
   
   protected

data/lib/app_generators/taza/templates/config.yml.erb

@@ -1,3 +1,3 @@
 ---
-:browser: :firefox
-:driver: :selenium
+browser: firefox
+driver: selenium

data/lib/app_generators/taza/templates/console.cmd.erb

@@ -0,0 +1 @@
+@ruby script/console %*

data/lib/app_generators/taza/templates/console.erb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+libs = ""
+Dir.glob(File.expand_path("#{File.dirname(__FILE__)}/../lib/sites/*.rb")).each do |file|
+  libs << " -r '#{file}'"
+end
+
+ENV['TAZA_ENV'] = ARGV.first || ENV['TAZA_ENV'] || 'isolation'
+exec "#{irb} #{libs} --simple-prompt"

data/lib/extensions/hash.rb

@@ -2,4 +2,14 @@ class Hash
   def convert_hash_keys_to_methods(fixture) # :nodoc:
     Taza::Entity.new(self,fixture)
   end
+
+  # Recursively replace key names that should be symbols with symbols.
+  def key_strings_to_symbols!
+    result = Hash.new
+    self.each_pair do |key,value|
+      value.key_strings_to_symbols! if value.kind_of? Hash and value.respond_to? :key_strings_to_symbols!
+      result[key.to_sym] = value
+    end
+    self.replace(result)
+  end
 end

data/lib/taza/browser.rb

@@ -19,7 +19,7 @@ module Taza
     def self.create_watir(params)
       method = "watir_#{params[:browser]}"
       raise BrowserUnsupportedError unless self.respond_to?(method)
-      watir = self.send(method).new
+      watir = self.send(method,params)
       watir
     end
 
@@ -28,19 +28,22 @@ module Taza
       Selenium::SeleniumDriver.new(params[:server_ip],params[:server_port],'*' + params[:browser].to_s,params[:timeout])
     end
 
-    def self.watir_firefox
+    def self.watir_firefox(params)
       require 'firewatir'
-      FireWatir::Firefox
+      FireWatir::Firefox.new
     end
 
-    def self.watir_safari
+    def self.watir_safari(params)
       require 'safariwatir'
-      Watir::Safari
+      Watir::Safari.new
     end
 
-    def self.watir_ie
+    def self.watir_ie(params)
       require 'watir'
-      Watir::IE
+      if params[:attach]
+         browser = Watir::IE.find(:title, //)
+      end
+      browser || Watir::IE.new
     end
   end
   

data/lib/taza/entity.rb

@@ -42,7 +42,8 @@ module Taza
     end
 
     def to_hash
-      @hash
+      cloned_hash = @hash.clone
+      cloned_hash.key_strings_to_symbols!
     end
 
     private

data/lib/taza/options.rb

@@ -0,0 +1,25 @@
+require 'user-choices'
+module Taza
+  class Options < UserChoices::Command
+    include UserChoices
+
+    def add_sources(builder)
+#     builder.add_source(CommandLineSource, :usage, "Usage: ruby #{$0} [options] file1 [file2]")
+      builder.add_source(EnvironmentSource, :mapping, {:browser => 'BROWSER', :driver => 'DRIVER', :attach => 'ATTACH', :timeout => 'TIMEOUT', :server_ip => 'SERVER_IP', :server_port => 'SERVER_PORT'})
+      builder.add_source(YamlConfigFileSource, :from_complete_path, Settings.config_file_path)
+    end
+
+    def add_choices(builder)
+     builder.add_choice(:browser, :type=>:string, :default=>'firefox')
+     builder.add_choice(:driver, :type=>:string, :default=>'selenium')
+     builder.add_choice(:attach, :type=>:boolean, :default=>false)
+     builder.add_choice(:timeout, :type=>:string)
+     builder.add_choice(:server_ip, :type=>:string)
+     builder.add_choice(:server_port, :type=>:string)
+    end
+
+    def execute
+      @user_choices
+    end
+  end
+end

data/lib/taza/settings.rb

@@ -1,25 +1,11 @@
 require 'activesupport'
+require 'taza/options'
 
 module Taza
   class Settings
-    # The config settings for a site.yml file.  ENV variables will override the settings:
-    #  Can override the browser in config via ENV['BROWSER']
-    #  Can override the driver in config via ENV['DRIVER']
-    #  Can override the timeout in config via ENV['TIMEOUT']
-    #  Can override the server_ip in config via ENV['SERVER_IP']
-    #  Can override the server_port in config via ENV['SERVER_PORT']
-    #
-    # Example:
     #   Taza::Settings.Config('google')
     def self.config(site_name)
-      env_settings = {}
-      env_settings[:browser] = ENV['BROWSER'].to_sym if ENV['BROWSER']
-      env_settings[:driver]  = ENV['DRIVER'].to_sym if ENV['DRIVER']
-      env_settings[:timeout] = ENV['TIMEOUT'] if ENV['TIMEOUT']
-      env_settings[:server_ip] = ENV['SERVER_IP'] if ENV['SERVER_IP']
-      env_settings[:server_port] = ENV['SERVER_PORT'] if ENV['SERVER_PORT']
-      env_settings = {:browser=>:firefox,:driver=>:selenium}.merge(config_file.merge(env_settings))
-      site_file(site_name).merge(env_settings)
+      site_file(site_name).merge(Options.new.execute)
     end
 
     # Loads the config file for the entire project and returns the hash.

data/spec/browser_spec.rb

@@ -1,6 +1,7 @@
 require 'spec/spec_helper'
 require 'taza/browser'
 require 'taza/settings'
+require 'taza/options'
 require 'selenium'
 require 'watir'
 
@@ -25,7 +26,7 @@ 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
@@ -55,4 +56,31 @@ describe Taza::Browser do
     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)
+  end
 end

data/spec/entity_spec.rb

@@ -21,5 +21,15 @@ 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')
+  end
+
+  it "should be able to do string-to-symbol conversion for hash keys" do
+    entity = Taza::Entity.new({'fruits' => {'apple' => 'pie' }},nil)
+    entity.to_hash[:fruits][:apple].should eql('pie')
+  end
 
 end

data/spec/project_generator_spec.rb

@@ -43,4 +43,14 @@ describe "Project Generator" do
     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
+  end
+
+  it "should generate a windows console script" do
+    run_generator('taza', [APP_ROOT], generator_sources)
+    File.exists?(File.join(APP_ROOT,'script','console.cmd')).should be_true
+  end
+
 end

data/spec/sandbox/config/config.yml

@@ -1 +1 @@
-:nothing: :something
+nothing: something

data/spec/settings_spec.rb

@@ -1,6 +1,7 @@
 require 'spec/spec_helper'
 require 'rubygems'
 require 'taza/settings'
+require 'taza/options'
 require 'taza/site'
 
 describe Taza::Settings do
@@ -13,24 +14,26 @@ describe Taza::Settings do
     ENV['TAZA_ENV'] = 'isolation'
     ENV['BROWSER'] = nil
     ENV['DRIVER'] = nil
+    ENV['ATTACH'] = 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)
+    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)
+    Taza::Settings.config(@site_name)[:driver].should eql('selenium')
+    Taza::Settings.config(@site_name)[:browser].should eql('firefox')
+    Taza::Settings.config(@site_name)[:attach].should eql(false)
   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)
+    Taza::Settings.config(@site_name)[:driver].should eql('bar')
   end
 
   it "should be able to load the site yml" do
@@ -45,16 +48,16 @@ describe Taza::Settings do
   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)
+    UserChoices::YamlConfigFileSource.any_instance.stubs(:format_specific_reading).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})
+    UserChoices::YamlConfigFileSource.any_instance.stubs(:format_specific_reading).returns({'browser' => 'fu'})
     Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.config(@site_name)[:browser].should eql(:opera)
+    Taza::Settings.config(@site_name)[:browser].should eql('opera')
   end
 
   it "should use the correct config file to set defaults" do
@@ -72,9 +75,9 @@ describe Taza::Settings do
   end
 
   it "should use the config file's variable for driver settings if no environment variable is set" do
+    UserChoices::YamlConfigFileSource.any_instance.stubs(:format_specific_reading).returns({'driver' => 'fun'})
     Taza::Settings.stubs(:path).returns("spec/sandbox")
-    Taza::Settings.stubs(:config_file).returns({:driver => :fun})
-    Taza::Settings.config(@site_name)[:driver].should eql(:fun)
+    Taza::Settings.config(@site_name)[:driver].should eql('fun')
   end
 
   class SiteName < Taza::Site

data/spec/site_spec.rb

@@ -2,6 +2,7 @@ require 'spec/spec_helper'
 require 'rubygems'
 require 'taza/site'
 require 'taza/settings'
+require 'taza/options'
 require 'taza/browser'
 require 'taza/page'
 require 'taza/flow'

data/taza.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{taza}
-  s.version = "0.8.6"
+  s.version = "0.8.7"
 
   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.date = %q{2009-05-07}
   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.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/app_generators/taza/templates/console.cmd.erb", "lib/app_generators/taza/templates/console.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/entity.rb", "lib/taza/fixture.rb", "lib/taza/fixtures.rb", "lib/taza/flow.rb", "lib/taza/page.rb", "lib/taza/settings.rb", "lib/taza/options.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/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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scudco-taza
 version: !ruby/object:Gem::Version 
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors: 
 - Adam Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-05-07 00:00:00 -07:00
 default_executable: taza
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,6 +104,8 @@ files:
 - 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/app_generators/taza/templates/console.cmd.erb
+- lib/app_generators/taza/templates/console.erb
 - lib/extensions
 - lib/extensions/array.rb
 - lib/extensions/hash.rb
@@ -111,13 +113,13 @@ 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
 - lib/taza/flow.rb
 - lib/taza/page.rb
 - lib/taza/settings.rb
+- lib/taza/options.rb
 - lib/taza/site.rb
 - lib/taza/tasks.rb
 - lib/taza.rb
@@ -133,9 +135,6 @@ 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