taza 2.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e293957e1c075d4d126ec7a5a66196fa70091511
-  data.tar.gz: 30d3fc63bbf1fd3ff6a7efd4d1dd50146e3e632a
+SHA256:
+  metadata.gz: caeaad92ea65ec84cfe2e36775a1e263829bd1e8cf91d4bc55b0478ebcab83a4
+  data.tar.gz: 0c59e875770890272dceb83ba3c2f76b69ab61e86ac36524ea31d14c2ef73d0b
 SHA512:
-  metadata.gz: 58475aa00a5d5efd8f2ea0e70958e82c3de205846b9146c37604fa208dfc7bb27dfad19caf90c6958c72f705abbab2e93035fd90eb5ca5df9bceda8f8fe30e32
-  data.tar.gz: cf7aada1dd2abb7ae75db85f28eecd01d2e556cfd96fa3ae149656999483f71954d59409a6a193d74f070ad273454666f569b8dd8e12948aae0ff898b8d64886
+  metadata.gz: 2af6ddbcaf9b4f386266e33ee7109901d2d5b47b257899416b102dca8c3d73b66126719a42eed17e7d7ec6f2a0d46a846b1cd07b359633f74f8b35955b621d13
+  data.tar.gz: 97328065e422959c1157e967355e4d3d87089db3d0a395d7c4ba788d8e4a5aac648143dddfd3a469cb8f5ecff56e7c2a15a54b9a684625f22042e758ecc1693a

data/History.txt

@@ -1,6 +1,14 @@
 === master
 
+* Do not require users to use Rake, RSpec, or Mocha
+
+== 3.0.0
 * Run builds against more versions of Ruby and ActiveSupport
+* Increase the ActiveSupport dependency to 4.0.2+
+* Replace firewatir and watir-webdriver with watir
+* Drop support for Ruby 1.9.3
+* Add support for Ruby 2.4 and 2.5
+
 
 === 1.0
 updated to RSpec 3 (thanks @drewboardman)

data/README.md

@@ -1,8 +1,9 @@
-#taza [![Gem Version](https://badge.fury.io/rb/taza.svg)](https://badge.fury.io/rb/taza)
+# taza [![Gem Version](https://badge.fury.io/rb/taza.svg)](https://badge.fury.io/rb/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)
 
+![Build Status](https://github.com/hammernight/taza/actions/workflows/ruby.yml/badge.svg)
 
 * https://github.com/hammernight/taza
 * Wiki: http://github.com/scudco/taza/wikis
@@ -44,9 +45,8 @@ Here's an example for starting a project around Google apps:
 
 ```
   $ taza create google
-  $ cd google/
   $ taza site google
-  $ taza page home_page google
+  $ taza page home google
   $ taza flow search google
   $ rake spec:isolation:google
 ```

data/lib/taza/browser.rb

@@ -17,14 +17,7 @@ module Taza
     private
 
     def self.create_watir(params)
-      method = "watir_#{params[:browser]}"
-      raise BrowserUnsupportedError unless self.respond_to?(method)
-      watir = self.send(method,params)
-      watir
-    end
-
-    def self.create_watir_webdriver(params)
-      require 'watir-webdriver'
+      require 'watir'
       Watir::Browser.new(params[:browser])
     end
 
@@ -43,27 +36,6 @@ module Taza
       end
       Selenium::WebDriver.for params[:browser].to_sym
     end
-
-    def self.watir_firefox(params)
-      require 'firewatir'
-      FireWatir::Firefox.new
-    end
-
-    def self.watir_safari(params)
-      require 'safariwatir'
-      Watir::Safari.new
-    end
-
-    def self.watir_ie(params)
-      require 'watir'
-      if params[:attach]
-        browser = Watir::Browser.find(:title, //)
-      end
-      browser || Watir::Browser.new
-    end
   end
-
-  # We don't know how to create the browser you asked for
-  class BrowserUnsupportedError < StandardError; end
 end
 

data/lib/taza/entity.rb

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

data/lib/taza/fixture.rb

@@ -1,6 +1,5 @@
 require 'find'
 require 'erb'
-require 'extensions/hash'
 require 'taza/entity'
 
 module Taza
@@ -28,7 +27,7 @@ module Taza
         templatized_fixture=ERB.new(File.read(file))
         entitized_fixture = {}
         YAML.load(templatized_fixture.result).each do |key, value|
-          entitized_fixture[key] = value.convert_hash_keys_to_methods(self)
+          entitized_fixture[key] = Taza::Entity.new(value, self)
         end
         @fixtures[File.basename(file,'.yml').to_sym] = entitized_fixture
       end

data/lib/taza/generators/project_generator.rb

@@ -15,16 +15,16 @@ module Taza
 
     desc "This creates the Taza project structure. Example taza create foo"
     def create
-      template('templates/project/Gemfile.tt', 'Gemfile') unless File.exists? 'Gemfile'
-      template('templates/project/Rakefile.tt', 'Rakefile') unless File.exists? 'Rakefile'
-      template('templates/project/config.yml.tt', 'config/config.yml') unless File.exists? 'config/config.yml'
+      template('templates/project/Gemfile.tt', 'Gemfile') unless File.exist? 'Gemfile'
+      template('templates/project/Rakefile.tt', 'Rakefile') unless File.exist? 'Rakefile'
+      template('templates/project/config.yml.tt', 'config/config.yml') unless File.exist? 'config/config.yml'
       empty_directory 'lib/sites'
       empty_directory 'spec'
-      template('templates/project/spec_helper.rb.tt', 'spec/spec_helper.rb') unless File.exists? 'spec/spec_helper.rb'
+      template('templates/project/spec_helper.rb.tt', 'spec/spec_helper.rb') unless File.exist? 'spec/spec_helper.rb'
       empty_directory 'spec/isolation'
       empty_directory 'spec/integration'
       empty_directory 'bin'
-      template('templates/project/taza.tt', 'bin/taza') unless File.exists? 'bin/taza'
+      template('templates/project/taza.tt', 'bin/taza') unless File.exist? 'bin/taza'
     end
   end
 end

data/lib/taza/page.rb

@@ -109,11 +109,9 @@ module Taza
     end
 
     def add_element_method(params) # :nodoc:
-      metaclass.class_eval do
-        define_method(params[:element_name]) do |*args|
-          check_filters(params)
-          self.instance_exec(*args,&params[:element_block])
-        end
+      define_singleton_method(params[:element_name]) do |*args|
+        check_filters(params)
+        self.instance_exec(*args, &params[:element_block])
       end
     end
 

data/lib/taza/site.rb

@@ -1,4 +1,3 @@
-
 module Taza
   # An abstraction of a website, but more really a container for a sites pages.
   #
@@ -49,7 +48,12 @@ module Taza
     #   :browser => a browser object to act on instead of creating one automatically
     #   :url => the url of where to start the site
     def initialize(params={},&block)
-      @module_name = self.class.parent.to_s
+      if self.class.respond_to?(:module_parent)
+        @module_name = self.class.module_parent.to_s
+      else
+        @module_name = self.class.parent.to_s
+      end
+
       @class_name  = self.class.to_s.split("::").last
       define_site_pages
       define_flows

data/lib/taza/version.rb

@@ -1,3 +1,3 @@
 module Taza
-  VERSION = "2.1.0"
+  VERSION = "4.0.0"
 end

data/lib/taza.rb

@@ -7,10 +7,6 @@ require 'taza/settings'
 require 'taza/flow'
 require 'taza/entity'
 require 'taza/fixtures'
-require 'extensions/object'
-require 'extensions/string'
-require 'extensions/hash'
-require 'extensions/array'
 require 'formatters/failing_examples_formatter'
 
 #generators

data/spec/generators/flow_generator_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe Taza::FlowGenerator do
 
   before(:each) do
-    capture(:stdout) { Taza::SiteGenerator.new(['foo_site']).site }
+    capture_stdout { Taza::SiteGenerator.new(['foo_site']).site }
   end
 
   context "taza flow checkout foo_site" do
     context "creates" do
 
       let(:subject) { Taza::FlowGenerator.new(['checkout', 'foo_site']) }
-      let(:output) { capture(:stdout) { subject.flow } }
+      let(:output) { capture_stdout { subject.flow } }
 
       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.exist?('lib/sites/foo_site/flows/checkout.rb')).to be true
       end
 
       it 'a message if site does not exist' do
-        bar_page = capture(:stdout) { Taza::FlowGenerator.new(['checkout', 'bar_site']).flow }
+        bar_page = capture_stdout { Taza::FlowGenerator.new(['checkout', 'bar_site']).flow }
         expect(bar_page).to include("No such site bar_site exists")
       end
     end

data/spec/generators/page_generator_spec.rb

@@ -4,26 +4,26 @@ describe Taza::PageGenerator do
   include Helpers::Taza
 
   before(:each) do
-    capture(:stdout) { Taza::SiteGenerator.new(['foo_site']).site }
+    capture_stdout { Taza::SiteGenerator.new(['foo_site']).site }
   end
 
   context "taza page home foo_site" do
     context "creates" do
 
       let(:subject) { Taza::PageGenerator.new(['home', 'foo_site']) }
-      let(:output) { capture(:stdout) { subject.page  }}
+      let(:output) { capture_stdout { subject.page  }}
 
       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.exist?('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.exist?('spec/isolation/home_page_spec.rb')).to be true
       end
 
       it 'gives message if site does not exist' do
-        bar_page = capture(:stdout) { Taza::PageGenerator.new(['checkout', 'bar_site']).page }
+        bar_page = capture_stdout { Taza::PageGenerator.new(['checkout', 'bar_site']).page }
         expect(bar_page).to include("No such site bar_site exists")
       end
 

data/spec/generators/partial_generator_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe Taza::PartialGenerator do
 
   before(:each) do
-    capture(:stdout) { Taza::SiteGenerator.new(['foo_site']).site }
+    capture_stdout { Taza::SiteGenerator.new(['foo_site']).site }
   end
 
   context "taza partial navigation foo_site" do
     context "creates" do
 
       let(:subject) { Taza::PartialGenerator.new(['navigation', 'foo_site']) }
-      let(:output) { capture(:stdout) { subject.partial } }
+      let(:output) { capture_stdout { subject.partial } }
 
       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.exist?('lib/sites/foo_site/pages/partials/navigation.rb')).to be true
       end
 
       it 'message if site does not exist' do
-        bar_page = capture(:stdout) { Taza::PartialGenerator.new(['navigation', 'bar_site']).partial }
+        bar_page = capture_stdout { Taza::PartialGenerator.new(['navigation', 'bar_site']).partial }
         expect(bar_page).to include("No such site bar_site exists")
       end
     end

data/spec/generators/project_generator_spec.rb

@@ -5,16 +5,16 @@ describe Taza::ProjectGenerator do
     context "creates" do
 
       let(:subject) { Taza::ProjectGenerator.new(['foo_site']) }
-      let(:output) { capture(:stdout) { subject.create } }
+      let(:output) { capture_stdout { subject.create } }
 
       it 'a Gemfile' do
         expect(output).to include("Gemfile")
-        expect(File.exists?('Gemfile')).to be true
+        expect(File.exist?('Gemfile')).to be true
       end
 
       it 'a Rakefile' do
         expect(output).to include('Rakefile')
-        expect(File.exists?('Rakefile')).to be true
+        expect(File.exist?('Rakefile')).to be true
       end
 
       it 'the Rakefile can be required' do
@@ -24,7 +24,7 @@ describe Taza::ProjectGenerator do
 
       it 'config/config.yml' do
         expect(output).to include('config/config.yml')
-        expect(File.exists?('config/config.yml')).to be true
+        expect(File.exist?('config/config.yml')).to be true
       end
 
       it 'lib/sites' do
@@ -34,7 +34,7 @@ describe Taza::ProjectGenerator do
 
       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.exist?('spec/spec_helper.rb')).to be true
       end
 
       it 'spec_helper.rb can be required' do
@@ -59,17 +59,17 @@ describe Taza::ProjectGenerator do
 
       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.exist?('spec/spec_helper.rb')).to be true
       end
 
       xit "should generate a console script" do
         run_generator('taza', [APP_ROOT], generator_sources)
-        expect(File.exists?(File.join(APP_ROOT, 'script', 'console'))).to be true
+        expect(File.exist?(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)
-        expect(File.exists?(File.join(APP_ROOT, 'script', 'console.cmd'))).to be true
+        expect(File.exist?(File.join(APP_ROOT, 'script', 'console.cmd'))).to be true
       end
     end
   end

data/spec/generators/site_generator_spec.rb

@@ -5,11 +5,11 @@ describe Taza::SiteGenerator do
     context "creates" do
 
       let(:subject) { Taza::SiteGenerator.new(['foo_site']) }
-      let(:output) { capture(:stdout) { subject.site } }
+      let(:output) { capture_stdout { subject.site } }
 
       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.exist?('lib/sites/foo_site.rb')).to be true
       end
 
       it 'lib/sites/foo_site' do
@@ -34,11 +34,11 @@ describe Taza::SiteGenerator do
 
       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.exist?('config/foo_site.yml')).to be true
       end
 
       it 'does not overwrite existing site' do
-        capture(:stdout) { Taza::SiteGenerator.new(['foo_site']).site }
+        capture_stdout { Taza::SiteGenerator.new(['foo_site']).site }
         expect(output).to include(*["identical", "exist"])
       end
 

data/spec/spec_helper.rb

@@ -3,12 +3,11 @@ require 'bundler/setup'
 require 'mocha'
 require 'taza'
 require 'thor'
-require 'watir-webdriver'
+require 'watir'
 require 'selenium-webdriver'
 
 RSpec.configure do |config|
   config.mock_with :mocha
-
   config.before(:each) do
     $0 = 'home'
     ARGV.clear
@@ -22,21 +21,20 @@ RSpec.configure do |config|
     FileUtils.rmtree(@directory)
   end
 
-  def capture(stream)
+  def capture_stdout
     begin
-      stream = stream.to_s
-      eval "$#{stream} = StringIO.new"
+      $stdout = StringIO.new
       yield
-      result = eval("$#{stream}").string
+      out = $stdout.string
     ensure
-      eval("$#{stream} = #{stream.upcase}")
+      $stdout = STDOUT
     end
-    result
+    out
   end
 end
 
 def null_device
-  File.exists?('/dev/null') ? '/dev/null' : 'NUL'
+  File.exist?('/dev/null') ? '/dev/null' : 'NUL'
 end
 
 # Must set before requiring generator libs.

data/spec/taza/browser_spec.rb

@@ -13,13 +13,13 @@ describe Taza::Browser do
   end
 
   it "should raise unknown browser error for unsupported watir browsers" do
-    expect(lambda { Taza::Browser.create(:browser => :foo_browser_9000,:driver => :watir) }).to raise_error(StandardError)
+    expect { Taza::Browser.create(:browser => :foo_browser_9000, :driver => :watir) }.to raise_error(StandardError)
   end
 
   it "should use params browser type when creating selenium" do
     skip "Travis cant load selenium. :("
     browser_type = :opera
-    Selenium::SeleniumDriver.expects(:new).with(anything,anything,'*opera',anything)
+    Selenium::SeleniumDriver.expects(:new).with(anything, anything, '*opera', anything)
     Taza::Browser.create(:browser => browser_type, :driver => :selenium)
   end
 
@@ -29,7 +29,7 @@ describe Taza::Browser do
 
   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)
+    browser = Taza::Browser.create(:browser => :firefox, :driver => :watir)
   end
 
   it 'should use params browser type when creating a selenium webdriver instance' do
@@ -43,19 +43,19 @@ describe Taza::Browser do
   end
 
   it "should use environment settings for server port and ip" do
-    #TODO:we need to make this more dynamic and move the skeleton project to the temp dir
-    Taza::Settings.stubs(:path).returns(File.join(@original_directory,'spec','sandbox'))
+    # TODO:we need to make this more dynamic and move the skeleton project to the temp dir
+    Taza::Settings.stubs(:path).returns(File.join(@original_directory, 'spec', 'sandbox'))
     ENV['SERVER_PORT'] = 'server_port'
     ENV['SERVER_IP'] = 'server_ip'
-    Selenium::SeleniumDriver.expects(:new).with('server_ip','server_port',anything,anything)
+    Selenium::SeleniumDriver.expects(:new).with('server_ip', 'server_port', anything, anything)
     Taza::Browser.create(
-        Taza::Settings.config("SiteName"))
+      Taza::Settings.config("SiteName"))
   end
 
   it "should use environment settings for timeout" do
-    Taza::Settings.stubs(:path).returns(File.join(@original_directory,'spec','sandbox'))
+    Taza::Settings.stubs(:path).returns(File.join(@original_directory, 'spec', 'sandbox'))
     ENV['TIMEOUT'] = 'timeout'
-    Selenium::SeleniumDriver.expects(:new).with(anything,anything,anything,'timeout')
+    Selenium::SeleniumDriver.expects(:new).with(anything, anything, anything, 'timeout')
     Taza::Browser.create(Taza::Settings.config("SiteName"))
   end
 

data/spec/taza/fixture_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'taza/fixture'
-require 'extensions/array'
 
 describe Taza::Fixture do
   before :each do
@@ -30,7 +29,7 @@ describe Taza::Fixture do
   it "should be able to get all fixtures loaded excluding sub-folder fixtures" do
     fixture = Taza::Fixture.new
     fixture.load_fixtures_from(@base_path)
-    expect(fixture.fixture_names).to be_equivalent [:examples,:users,:foos]
+    expect(fixture.fixture_names).to contain_exactly(:examples, :users, :foos)
   end
 
   it "should be able to get specific fixture entities" do

data/spec/taza/fixtures_spec.rb

@@ -1,21 +1,22 @@
 require 'spec_helper'
 
-
 describe "Taza::Fixtures" do
-
-  Taza::Fixture.stubs(:base_path).returns('./spec/sandbox/fixtures/')
-  Taza.load_fixtures
-  include Taza::Fixtures
+  before do
+    stub_path = File.join(@original_directory, 'spec', 'sandbox', 'fixtures', '')
+    Taza::Fixture.stubs(:base_path).returns(stub_path)
+    Taza.load_fixtures
+    self.class.include(Taza::Fixtures)
+  end
 
   it "should be able to look up a fixture entity off fixture_methods module" do
     expect(examples(:first_example).name).to eql 'first'
   end
 
   it "should still raise method missing error" do
-    expect(lambda{zomgwtf(:first_example)}).to raise_error(NoMethodError)
+    expect{ zomgwtf(:first_example) }.to raise_error(NoMethodError)
   end
 
-  #TODO: this test tests what is in entity's instance eval not happy with it being here
+  # 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
     expect(examples(:first_example).user.name).to eql users(:shatner).name
   end
@@ -30,7 +31,7 @@ describe "Taza::Fixtures" do
   end
 
   it "should not be able to access fixtures in sub-folders if not included" do
-    expect(lambda{bars(:foo)}).to raise_error(NoMethodError)
+    expect{ bars(:foo) }.to raise_error(NoMethodError)
   end
 
   it "should template fixture files" do

data/spec/taza/page_module_spec.rb

@@ -27,7 +27,7 @@ describe "Taza Page Module" do
 
 
   it "should not execute elements that belong to a page module but accessed without it" do
-    expect(lambda { AnotherPageWithModule.new.another_module_element }).to raise_error(NoMethodError)
+    expect{ AnotherPageWithModule.new.another_module_element }.to raise_error(NoMethodError)
   end
 
   it "should execute elements in the context of their page module when accessed with it" do
@@ -100,7 +100,7 @@ describe "Taza Page Module" do
 
   it "should raise an error for page-module filters that return false" do
     page = PageWithFalseFilterAndModule.new(:module)
-    expect(lambda { page.sample_element }).to raise_error(Taza::FilterError)
+    expect{ page.sample_element }.to raise_error(Taza::FilterError)
   end
 
   class PageWithFilterAndModuleElements < ::Taza::Page
@@ -116,7 +116,7 @@ describe "Taza Page Module" do
 
   it "should execute filters for elements inside page modules" do
     page = PageWithFilterAndModuleElements.new(:module)
-    expect(lambda { page.sample_element }).to raise_error(Taza::FilterError)
+    expect{ page.sample_element }.to raise_error(Taza::FilterError)
   end
 
   class PageWithFiltersAndModuleElements < ::Taza::Page
@@ -139,7 +139,7 @@ describe "Taza Page Module" do
 
   it "should execute filters for specific and all elements inside page modules" do
     page = PageWithFiltersAndModuleElements.new(:module)
-    expect(lambda { page.sample_element }).to raise_error(Taza::FilterError)
+    expect{ page.sample_element }.to raise_error(Taza::FilterError)
     expect(page.another_sample_element).to eql :something
   end
 
@@ -167,7 +167,7 @@ describe "Taza Page Module" do
     foo = PageWithFiltersAndModulesAndElements.new(:foo_module)
     expect(foo.sample_element).to eql :something
     bar = PageWithFiltersAndModulesAndElements.new(:bar_module)
-    expect(lambda { bar.sample_element }).to raise_error(Taza::FilterError)
+    expect{ bar.sample_element }.to raise_error(Taza::FilterError)
   end
 
 end