scudco-taza 0.8.1 → 0.8.3

data/History.txt

@@ -1,7 +1,9 @@
-=== 0.8.1 / 2008-12-20
+=== 0.8.2 / 2009-01-11
 
 * Added Partials
 * Added Preliminary Fixture Support
+* Fixed horrible infinite loop bug in Filters
+* Added Configurability to a Taza projects Rakefile
 
 === 0.8.0 / 2008-11-23
 

data/VERSION.yml

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

data/generators/page/templates/functional_page_spec.rb.erb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 require '<%= site_name.underscore %>'
 
-describe "<%= name.camelize %>" do
+describe "<%= name.camelize %>Page" do
   it "should fail because you haven't written any tests yet" do
     false.should be_true
   end

data/lib/app_generators/taza/templates/rakefile.rb.erb

@@ -1,3 +1,10 @@
 <%= "#Generated at #{Time.now}" %>
 require 'rubygems'
 require 'taza/tasks'
+
+Taza::Rake::Tasks.new do |t|
+  file_hole = "artifacts/#{Time.now.to_i}"
+  t.spec_opts = ["--format html:#{file_hole}/index.html",
+                  "--format p",
+                  "--format failing_examples:#{file_hole}/failing_examples.txt"]
+end

data/lib/taza/browser.rb

@@ -17,9 +17,10 @@ module Taza
     private    
 
     def self.create_watir(params)
-      require 'watir'
-      Watir::Browser.default = params[:browser].to_s
-      Watir::Browser.new
+      method = "watir_#{params[:browser]}"
+      raise BrowserUnsupportedError unless self.respond_to?(method)
+      watir = self.send(method).new
+      watir
     end
 
     def self.create_selenium(params)
@@ -27,7 +28,23 @@ module Taza
       Selenium::SeleniumDriver.new(params[:server_ip],params[:server_port],'*' + params[:browser].to_s,params[:timeout])
     end
 
+    def self.watir_firefox
+      require 'firewatir'
+      FireWatir::Firefox
+    end
+
+    def self.watir_safari
+      require 'safariwatir'
+      Watir::Safari
+    end
+
+    def self.watir_ie
+      require 'watir'
+      Watir::IE
+    end
   end
   
+  # We don't know how to create the browser you asked for
+  class BrowserUnsupportedError < StandardError; end
 end
 

data/lib/taza/page.rb

@@ -1,17 +1,17 @@
 module Taza
   # An abstraction of a web page, place the elements you care about accessing in here as well as specify the filters that apply when trying to access the element.
-  # 
+  #
   # Example:
   #   require 'taza'
   #   class HomePage < Taza::Page
   #     element(:foo) {browser.element_by_xpath('some xpath')}
-  #     filter :title_given, :foo 
-  #   
+  #     filter :title_given, :foo
+  #
   #     def title_given
   #       browser.title.nil?
   #     end
   #   end
-  # 
+  #
   # homepage.foo will return the element specified in the block if the filter returned true
   class Page
     attr_accessor :browser
@@ -39,12 +39,12 @@ module Taza
     # Example:
     #   class HomePage < Taza::Page
     #     element(:foo) {browser.element_by_xpath('some xpath')}
-    #     filter :title_given, :foo 
+    #     filter :title_given, :foo
     #     #a filter will apply to all elements if none are specified
     #     filter :some_filter
     #     #a filter will also apply to all elements if the symbol :all is given
     #     filter :another_filter, :all
-    #     
+    #
     #     def some_filter
     #       true
     #     end
@@ -66,6 +66,7 @@ module Taza
 
     def initialize
       add_element_methods
+      @active_filters = []
     end
 
     def add_element_methods # :nodoc:
@@ -83,10 +84,14 @@ module Taza
         end
       end
     end
-    
+
     def check_filters(params) # :nodoc:
       params[:filters].each do |filter_method|
-        raise FilterError, "#{filter_method} returned false for #{params[:element_name]}" unless send(filter_method)
+        unless @active_filters.include?(filter_method)
+          @active_filters << filter_method
+          raise FilterError, "#{filter_method} returned false for #{params[:element_name]}" unless send(filter_method)
+          @active_filters.delete(filter_method)
+        end
       end
     end
   end

data/lib/taza/tasks.rb

@@ -1,6 +1,5 @@
-require 'rake'
-require 'rake/testtask'
 require 'rubygems'
+require 'rake'
 require 'taglob/rake/tasks'
 require 'spec/rake/spectask'
 
@@ -8,41 +7,46 @@ def tags
   ENV['TAGS']
 end
 
-namespace :spec do
-  def format_options(file_name)
-    file_name = "artifacts/#{file_name}/index.html"
-    dir_name = File.dirname(file_name)
-    FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
-    ["--format","html:#{file_name}","--format","p"]
-  end
+module Taza
+  module Rake
+    class Tasks
+      attr_accessor :spec_opts
 
-  desc "Run all functional specs"
-  Spec::Rake::SpecTask.new :functional do |t|
-    t.spec_files = Dir.taglob('spec/functional/**/*_spec.rb',tags)
-    t.spec_opts << format_options("functional/all")
-  end
-  desc "Run all integration specs"
-  Spec::Rake::SpecTask.new :integration do |t|
-    t.spec_files = Dir.taglob('spec/integration/**/*_spec.rb',tags)
-    t.spec_opts << format_options("integration/all")
-  end
+      def initialize
+        yield self if block_given?
+        define
+      end
 
-  namespace :functional do
-    Dir.glob('./spec/functional/*/').each do |dir|
-      site_name = File.basename(dir)
-      desc "Run all functional specs for #{site_name}"
-      Spec::Rake::SpecTask.new site_name.to_sym do |t|
-        t.spec_files = Dir.taglob("#{dir}**/*_spec.rb",tags)
-        t.spec_opts << format_options("functional/#{site_name}/all")
+      def define_spec_task(name,glob_path)
+        Spec::Rake::SpecTask.new name do |t|
+          t.spec_files = Dir.taglob(glob_path,tags)
+          t.spec_opts << spec_opts
+        end
       end
-      namespace site_name.to_sym do
-        Dir.glob("./spec/functional/#{site_name}/*_spec.rb").each do |page_spec_file|
-          page_spec_name = File.basename(page_spec_file)
-          page_name = page_spec_name.chomp('_spec.rb')
-          Spec::Rake::SpecTask.new page_name.to_sym do |t|
-            t.spec_files = page_spec_file
-            t.spec_opts << format_options("functional/#{site_name}/#{page_name}")
+
+      def define
+        namespace :spec do
+          desc "Run all functional specs"
+          define_spec_task(:functional,'spec/functional/**/*_spec.rb')
+          desc "Run all integration specs"
+          define_spec_task(:integration,'spec/integration/**/*_spec.rb')
+
+          namespace :functional do
+            Dir.glob('./spec/functional/*/').each do |dir|
+              site_name = File.basename(dir)
+              desc "Run all functional specs for #{site_name}"
+              define_spec_task(site_name,"#{dir}**/*_spec.rb")
+
+              namespace site_name do
+                Dir.glob("./spec/functional/#{site_name}/*_spec.rb").each do |page_spec_file|
+                  page_name = File.basename(page_spec_file,'_spec.rb')
+                  define_spec_task(page_name,page_spec_file)
+                end
+              end
+
+            end
           end
+
         end
       end
     end

data/spec/browser_spec.rb

@@ -16,11 +16,6 @@ describe Taza::Browser do
     ENV['TIMEOUT'] = nil
   end
 
-  module Watir
-    class Safari
-    end
-  end
-
   it "should raise unknown browser error for unsupported watir browsers" do
     lambda { Taza::Browser.create(:browser => :foo_browser_9000,:driver => :watir) }.should raise_error(StandardError)
   end

data/spec/page_spec.rb

@@ -11,6 +11,20 @@ describe Taza::Page do
     end
   end
 
+  class RecursiveFilterExample < Taza::Page
+    element(:foo) {}
+    filter :sample_filter
+    def sample_filter
+      foo
+      true
+    end
+  end
+
+  it "should not enter a infinite loop if you call a filtered element inside of a filter" do
+    page = RecursiveFilterExample.new
+    lambda { page.foo }.should_not raise_error
+  end
+
   it "should execute an element's block with the params provided for its method" do
     Taza::Page.element(:boo){|baz| baz}
     Taza::Page.new.boo("rofl").should == "rofl"

data/spec/project_generator_spec.rb

@@ -9,6 +9,7 @@ describe "Project Generator" do
 
   before :all do
     @spec_helper = File.join(TMP_ROOT,PROJECT_NAME,'spec','spec_helper.rb')
+    @rakefile = File.join(TMP_ROOT,PROJECT_NAME,'rakefile')
   end
 
   before :each do
@@ -24,6 +25,11 @@ describe "Project Generator" do
     system("ruby -c #{@spec_helper} > #{null_device}").should be_true
   end
 
+  it "should generate a rakefile that can be required" do
+    run_generator('taza', [APP_ROOT], generator_sources)
+    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)

data/spec/taza_tasks_spec.rb

@@ -23,6 +23,7 @@ describe "Taza Tasks" do
     Dir.stubs(:glob).with('./spec/functional/*/').returns(['./spec/functional/foo/'])
     Dir.stubs(:glob).with('./spec/functional/foo/*_spec.rb').returns([])
     load @file_name
+    Taza::Rake::Tasks.new
     tasks.include?("spec:functional:foo").should be_true
   end
 
@@ -30,6 +31,7 @@ describe "Taza Tasks" do
     Dir.expects(:glob).with('./spec/functional/*/').returns(['./spec/functional/foo/'])
     Dir.expects(:glob).with('./spec/functional/foo/*_spec.rb').returns(['./spec/functional/foo/page_spec.rb'])
     load @file_name
+    Taza::Rake::Tasks.new
     tasks.include?("spec:functional:foo:page").should be_true
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scudco-taza
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors: 
 - Adam Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-21 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: taza
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.11
+        version: 1.1.12
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubigen