taza 0.9.2.1 → 1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1eff424ac45cbf590db7dfa0d2aef5f5c7ccd55e
-  data.tar.gz: 8b9def534a0d587b7b567ce46876f3d183cd5554
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDI3NTkxMjllMTFkYmUzMTdkMTJmZDJjMmFjN2M1OTM5N2YyYTc2Yw==
+  data.tar.gz: !binary |-
+    Y2I1MTU0ZmM1NjY4OWJjOWQ4YzExZTYwOGVkMDI2MGZmMzhiYjZjZg==
 SHA512:
-  metadata.gz: cb6aef03458885f140f85fce63e2a6991c5e5665c767c58579688e77da7e55cdedaec86e447db953b755b46b5e43163d1e060673cf219aacdd7e20d763e6d34b
-  data.tar.gz: 40ee6a0305731a40af4644224b42685bca7b57df0c2b33afca72c56f689990d24174c62f265b1ca91ba18aabfda7eebe3d40cb379c91ab4f834c6d778e47555d
+  metadata.gz: !binary |-
+    NmIwNzQwMWE0ZDg1ZGIxMmI2ZjdiNGIxMzNjNDgzZGM5OTY2YTgzODQxN2Y0
+    NjAyNWM4Nzc4YTYxODczZDQ0OWY3OGYxYTU3OGRkZDZlNTBkM2YyOTA1MGUx
+    NDU2YTUxODk4ZDgzYmI3OTg4ZjE0NTY5MWFmOWQ5OWNiMmQ1ZGU=
+  data.tar.gz: !binary |-
+    MGZmNzdiYTg4ZTk1ZWZjZTIyMjkxODEwYTU3NjA0MDRmNWJjYmNhMzFmODM2
+    NDBhODJhMTNjNjA4OGYwYTE1MTk3ZjY3NTU2Y2FlNDdlMzRiODg5MjU0Y2Yx
+    MTMyN2UxOGYwNzQ1NmY2OWU0ZGNjZDE1OTI3NmQzNTMzYzEyMWQ=

data/.gitignore

@@ -2,5 +2,7 @@
 .bundle
 Gemfile.lock
 pkg/*
-.idea/
 .rspec
+.rvmrc
+.idea/
+

data/.ruby-gemset

@@ -0,0 +1 @@
+taza

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+before_install: gem install bundler -v 1.11.2
 script: "bundle exec rspec spec"
 rvm:
   - 1.9.3
@@ -6,7 +7,7 @@ rvm:
   - 2.1.0
   - ruby-head
   - jruby-19mode
-  - rbx
+  - rbx-2
 notifications:
   email:
     - pnascimento@gmail.com

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in taza.gemspec
 gemspec

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0
+updated to RSpec 3 (thanks @drewboardman)
+taza now accepts erb settings.yml (thanks @drewboardman)
+
 === 0.9.1.2
 Experimental pure Webdriver support
 Fix app generator (thanks @certonaqa)

data/README.md

@@ -1,6 +1,11 @@
 #taza
+## Build Status
+###### Master 
+[![Build Status](https://travis-ci.org/hammernight/taza.svg?branch=master)](https://travis-ci.org/hammernight/taza) [![Code Climate](https://codeclimate.com/github/hammernight/taza.png)](https://codeclimate.com/github/hammernight/taza) [![Build Status](https://snap-ci.com/hammernight/taza/branch/master/build_image)](https://snap-ci.com/hammernight/taza/branch/master)
+
+###### Branches 
 [![Build Status](https://secure.travis-ci.org/hammernight/taza.png)](http://travis-ci.org/hammernight/taza)
-[![Code Climate](https://codeclimate.com/github/hammernight/taza.png)](https://codeclimate.com/github/hammernight/taza)
+
 
 * https://github.com/hammernight/taza
 * Wiki: http://github.com/scudco/taza/wikis

data/lib/formatters/failing_examples_formatter.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/formatters/documentation_formatter'
+require 'rspec'
 
 class FailingExamplesFormatter < RSpec::Core::Formatters::DocumentationFormatter
 

data/lib/taza.rb

@@ -1,5 +1,4 @@
 require 'active_support/all'
-require 'rspec'
 require 'taza/version'
 require 'taza/page'
 require 'taza/site'

data/lib/taza/browser.rb

@@ -57,9 +57,9 @@ module Taza
     def self.watir_ie(params)
       require 'watir'
       if params[:attach]
-        browser = Watir::IE.find(:title, //)
+        browser = Watir::Browser.find(:title, //)
       end
-      browser || Watir::IE.new
+      browser || Watir::Browser.new
     end
   end
 

data/lib/taza/fixture.rb

@@ -27,7 +27,7 @@ module Taza
       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|
+        YAML.load(templatized_fixture.result).each do |key, value|
           entitized_fixture[key] = value.convert_hash_keys_to_methods(self)
         end
         @fixtures[File.basename(file,'.yml').to_sym] = entitized_fixture

data/lib/taza/settings.rb

@@ -23,7 +23,7 @@ module Taza
     end
     
     def self.site_file(site_name) # :nodoc:
-      YAML.load_file(File.join(config_folder,"#{site_name.underscore}.yml"))[ENV['TAZA_ENV']]
+      YAML.load(ERB.new(File.read(File.join(config_folder,"#{site_name.underscore}.yml"))).result)[ENV['TAZA_ENV']]
     end
 
     def self.path # :nodoc:

data/lib/taza/site.rb

@@ -15,7 +15,7 @@ module Taza
   #
   #   end
   class Site
-    @@before_browser_closes = Proc.new() {}
+    @@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.
@@ -134,7 +134,7 @@ module Taza
     end
 
     def flows_path # :nodoc:
-      File.join(path,'flows','*.rb')
+      File.join(path,'flows','**','*.rb')
     end
 
     def path # :nodoc:

data/lib/taza/version.rb

@@ -1,3 +1,3 @@
 module Taza
-  VERSION = "0.9.2.1"
+  VERSION = "1.0"
 end

data/spec/generators/flow_generator_spec.rb

@@ -14,7 +14,7 @@ describe Taza::FlowGenerator do
 
       it 'a checkout.rb' do
         expect(output).to include('lib/sites/foo_site/flows/checkout.rb')
-        expect(File.exists?('lib/sites/foo_site/flows/checkout.rb')).to be_true
+        expect(File.exists?('lib/sites/foo_site/flows/checkout.rb')).to be true
       end
 
       it 'a message if site does not exist' do

data/spec/generators/page_generator_spec.rb

@@ -15,11 +15,11 @@ describe Taza::PageGenerator do
 
       it 'creates a checkout_page.rb' do
         expect(output).to include('lib/sites/foo_site/pages/home_page.rb')
-        expect(File.exists?('lib/sites/foo_site/pages/home_page.rb')).to be_true
+        expect(File.exists?('lib/sites/foo_site/pages/home_page.rb')).to be true
       end
       it 'creates a checkout_page_spec.rb' do
         expect(output).to include('spec/isolation/home_page_spec.rb')
-        expect(File.exists?('spec/isolation/home_page_spec.rb')).to be_true
+        expect(File.exists?('spec/isolation/home_page_spec.rb')).to be true
       end
 
       it 'gives message if site does not exist' do
@@ -30,7 +30,7 @@ describe Taza::PageGenerator do
       it 'generates a page that can be required' do
         output
         page_spec = 'spec/isolation/home_page_spec.rb'
-        expect(system("ruby -c #{page_spec} > #{null_device}")).to be_true
+        expect(system("ruby -c #{page_spec} > #{null_device}")).to be true
       end
 
       xit "should be able to access the generated page from the site" do

data/spec/generators/partial_generator_spec.rb

@@ -14,7 +14,7 @@ describe Taza::PartialGenerator do
 
       it 'a navigation.rb' do
         expect(output).to include('lib/sites/foo_site/pages/partials/navigation.rb')
-        expect(File.exists?('lib/sites/foo_site/pages/partials/navigation.rb')).to be_true
+        expect(File.exists?('lib/sites/foo_site/pages/partials/navigation.rb')).to be true
       end
 
       it 'message if site does not exist' do

data/spec/generators/project_generator_spec.rb

@@ -9,67 +9,67 @@ describe Taza::ProjectGenerator do
 
       it 'a Gemfile' do
         expect(output).to include("Gemfile")
-        expect(File.exists?('Gemfile')).to be_true
+        expect(File.exists?('Gemfile')).to be true
       end
 
       it 'a Rakefile' do
         expect(output).to include('Rakefile')
-        expect(File.exists?('Rakefile')).to be_true
+        expect(File.exists?('Rakefile')).to be true
       end
 
       it 'the Rakefile can be required' do
         output
-        system("ruby -c Rakefile > #{null_device}").should be_true
+        expect(system("ruby -c Rakefile > #{null_device}")).to be true
       end
 
       it 'config/config.yml' do
         expect(output).to include('config/config.yml')
-        expect(File.exists?('config/config.yml')).to be_true
+        expect(File.exists?('config/config.yml')).to be true
       end
 
       it 'lib/sites' do
         expect(output).to include('lib/sites')
-        expect(File.directory?('lib/sites')).to be_true
+        expect(File.directory?('lib/sites')).to be true
       end
 
       it 'a spec_helper.rb' do
         expect(output).to include('spec/spec_helper.rb')
-        expect(File.exists?('spec/spec_helper.rb')).to be_true
+        expect(File.exists?('spec/spec_helper.rb')).to be true
       end
 
       it 'spec_helper.rb can be required' do
         output
-        system("ruby -c spec/spec_helper.rb > #{null_device}").should be_true
+        expect(system("ruby -c spec/spec_helper.rb > #{null_device}")).to be true
       end
 
       it 'spec/isolation' do
         expect(output).to include('spec/isolation')
-        expect(File.directory?('spec/isolation')).to be_true
+        expect(File.directory?('spec/isolation')).to be true
       end
 
       it 'spec/integration' do
         expect(output).to include('spec/integration')
-        expect(File.directory?('spec/integration')).to be_true
+        expect(File.directory?('spec/integration')).to be true
       end
 
       it 'bin' do
         expect(output).to include('bin')
-        expect(File.directory?('bin')).to be_true
+        expect(File.directory?('bin')).to be true
       end
 
       it 'the taza executable' do
         expect(output).to include('spec/spec_helper.rb')
-        expect(File.exists?('spec/spec_helper.rb')).to be_true
+        expect(File.exists?('spec/spec_helper.rb')).to be true
       end
 
       xit "should generate a console script" do
         run_generator('taza', [APP_ROOT], generator_sources)
-        File.exists?(File.join(APP_ROOT, 'script', 'console')).should be_true
+        expect(File.exists?(File.join(APP_ROOT, 'script', 'console'))).to be true
       end
 
       xit "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
+        expect(File.exists?(File.join(APP_ROOT, 'script', 'console.cmd'))).to be true
       end
     end
   end

data/spec/generators/site_generator_spec.rb

@@ -9,32 +9,32 @@ describe Taza::SiteGenerator do
 
       it 'foo_site.rb' do
         expect(output).to include('lib/sites/foo_site.rb')
-        expect(File.exists?('lib/sites/foo_site.rb')).to be_true
+        expect(File.exists?('lib/sites/foo_site.rb')).to be true
       end
 
       it 'lib/sites/foo_site' do
         expect(output).to include('lib/sites/foo_site')
-        expect(File.directory?('lib/sites/foo_site')).to be_true
+        expect(File.directory?('lib/sites/foo_site')).to be true
       end
 
       it 'lib/sites/foo_site/flows' do
         expect(output).to include("lib/sites/foo_site/flows")
-        expect(File.directory?('lib/sites/foo_site/flows')).to be_true
+        expect(File.directory?('lib/sites/foo_site/flows')).to be true
       end
 
       it 'lib/sites/foo_site/pages' do
         expect(output).to include("lib/sites/foo_site/pages")
-        expect(File.directory?('lib/sites/foo_site/pages')).to be_true
+        expect(File.directory?('lib/sites/foo_site/pages')).to be true
       end
 
       it 'lib/sites/foo_site/pages/partials' do
         expect(output).to include("lib/sites/foo_site/pages/partials")
-        expect(File.directory?('lib/sites/foo_site/pages/partials')).to be_true
+        expect(File.directory?('lib/sites/foo_site/pages/partials')).to be true
       end
 
       it 'config/foo_site.yml' do
         expect(output).to include("config/foo_site.yml")
-        expect(File.exists?('config/foo_site.yml')).to be_true
+        expect(File.exists?('config/foo_site.yml')).to be true
       end
 
       it 'does not overwrite existing site' do
@@ -43,14 +43,14 @@ describe Taza::SiteGenerator do
       end
 
       it "generates a site that can uses the block given in new" do
-        pending 'will have to fix this later'
+        skip 'will have to fix this later'
         @site_class = generate_site(@site_name)
         stub_settings
         stub_browser
         foo = nil
         @site_class.new { |site| foo = site }
-        foo.should_not be_nil
-        foo.should be_a_kind_of(Taza::Site)
+        expect(foo).to_not be_nil
+        expect(foo).to be_a_kind_of Taza::Site
       end
     end
   end

data/spec/generators/taza_bin_spec.rb

@@ -2,19 +2,15 @@ require 'spec_helper'
 require 'rubygems'
 require 'fileutils'
 
-describe "Taza bin" do
-
-  it 'runs from the terminal' do
-    output = system("taza")
-    expect(output).to be_true
-
+describe 'Taza bin' do
+  context 'running taza in the terminal' do
+    specify { expect { system('taza') }.to output.to_stdout_from_any_process }
   end
 
-  it "should have an executable script" do
-    pending "Not sure this is really necessary, as this is just testing if command line returns anything. It also breaks JRuby."
+  it 'should have an executable script' do
+    skip 'Not sure this is really necessary, as this is just testing if command line returns anything. It also breaks JRuby.'
     path = 'spec/sandbox/generators'
     taza_bin = "#{File.expand_path(File.dirname(__FILE__)+'/../bin/taza')} #{path}"
-    system("ruby -c #{taza_bin} > #{null_device}").should be_true
+    expect(system("ruby -c #{taza_bin} > #{null_device}")).to be true
   end
-
 end

data/spec/platform/windows/browser_win.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require_relative '../../spec_helper'
 require 'taza/browser'
 require 'taza/settings'
 require 'taza/options'
@@ -16,32 +16,31 @@ describe Taza::Browser do
     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)
+    Watir::Browser.stubs(:find).returns(browser)
+    Watir::Browser.stubs(:new).returns(browser)
+    old_browser = Watir::Browser.new
+    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir, :attach => true)
+    expect(new_browser).to 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 
+    Watir::Browser.stubs(:find).returns(stub_everything)
+    Watir::Browser.stubs(:new).returns(browser)
+    Taza::Browser.create(:browser => :ie, :driver => :watir)
+    expect(browser).to be_truthy
   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)
+    Watir::Browser.stubs(:find).returns(foo)
+    Watir::Browser.stubs(:new).returns(bar)
+    new_browser = Taza::Browser.create(:browser => :ie, :driver => :watir)
+    expect(new_browser).to_not eql foo
   end
 
 end

data/spec/spec_helper.rb

@@ -68,7 +68,7 @@ module Helpers
     end
 
     def stub_browser
-      stub_browser = stub()
+      stub_browser = stub
       stub_browser.stubs(:goto)
       stub_browser.stubs(:close)
       ::Taza::Browser.stubs(:create).returns(stub_browser)

data/spec/taza/array_spec.rb

@@ -3,15 +3,15 @@ require 'extensions/array'
 
 describe 'Array Extensions' 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])
+    expect([1,2,3]).to_not be_equivalent [2,3]
   end
   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])
+    expect([1,2,3]).to_not be_equivalent [1,2,3,4]
   end
   it "should know it is equivalent if the same order" do
-    [1,2,3].should be_equivalent([1,2,3])
+    expect([1,2,3]).to be_equivalent [1,2,3]
   end
   it "should know it is equivalent if the different orders" do
-    [1,2,3].should be_equivalent([2,1,3])
+    expect([1,2,3]).to be_equivalent [2,1,3]
   end
 end

data/spec/taza/browser_spec.rb

@@ -13,11 +13,11 @@ describe Taza::Browser do
   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)
+    expect(lambda { Taza::Browser.create(:browser => :foo_browser_9000,:driver => :watir) }).to raise_error(StandardError)
   end
 
   it "should use params browser type when creating selenium" do
-    pending "Travis cant load selenium. :("
+    skip "Travis cant load selenium. :("
     browser_type = :opera
     Selenium::SeleniumDriver.expects(:new).with(anything,anything,'*opera',anything)
     Taza::Browser.create(:browser => browser_type, :driver => :selenium)
@@ -39,7 +39,7 @@ describe Taza::Browser do
 
   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)
+    expect(browser).to be_a_kind_of Selenium::SeleniumDriver
   end
 
   it "should use environment settings for server port and ip" do
@@ -61,7 +61,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)
+    expect(Taza::Browser.browser_class(:browser => :safari, :driver => :watir)).to eql Object
   end
 
 end