taza 0.9.2.1 → 1.0

data/spec/taza/site_fixtures_spec.rb

@@ -5,10 +5,10 @@ describe "Site Specific Fixtures" do
   include Taza::Fixtures::FooSite
 
   it "should be able to access fixtures in sub-folders" do
-    bars(:foo).name.should eql("foo")
+    expect(bars(:foo).name).to eql 'foo'
   end
 
   it "should not be able to access non-site-specific fixtures" do
-    lambda{foos(:gap)}.should raise_error(NoMethodError)
+    expect(lambda{foos(:gap)}).to raise_error(NoMethodError)
   end
 end

data/spec/taza/site_spec.rb

@@ -8,12 +8,14 @@ require 'taza/page'
 require 'taza/flow'
 
 describe Taza::Site do
+  before(:all) do
+    Foo = Class.new(Taza::Site)
+  end
   #TODO: we need to clean up these tests and remove the warning below
   #/Users/bisbot/Projects/Taza/taza/spec/taza/site_spec.rb:15: warning: already initialized constant Foo
   before :each do
-    @pages_path = File.join(@original_directory, "spec","sandbox","pages","foo","**","*.rb")
-    @flows_path = File.join(@original_directory, "spec","sandbox","flows","*.rb")
-    Foo = Class.new(Taza::Site)
+    @pages_path = File.join(@original_directory, 'spec', 'sandbox', 'pages', 'foo', '**', '*.rb')
+    @flows_path = File.join(@original_directory, 'spec', 'sandbox', 'flows', '*.rb')
     Foo.any_instance.stubs(:pages_path).returns(@pages_path)
     ENV['BROWSER'] = nil
     ENV['DRIVER'] = nil
@@ -22,23 +24,23 @@ describe Taza::Site do
     Taza::Site.before_browser_closes {}
   end
 
-  it "pages_path should contain the site class name" do
+  it 'pages_path should contain the site class name' do
     browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     Bax = Class.new(Taza::Site)
-    Bax.new.pages_path.should eql("./lib/sites/bax/pages/**/*.rb")
+    expect(Bax.new.pages_path).to eql './lib/sites/bax/pages/**/*.rb'
   end
 
-  it "should have flows defined as instance methods" do
+  it 'should have flows defined as instance methods' do
     browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     Barz = Class.new(Taza::Site)
     Barz.any_instance.stubs(:path).returns("#{@original_directory}/spec/sandbox/")
     Barz.any_instance.stubs(:flows_path).returns("#{@original_directory}/spec/sandbox/flows/batman.rb")
-    Barz.new.batman_flow.should == "i am batman"
+    expect(Barz.new.batman_flow).to eql 'i am batman'
   end
 
-  it "should open watir browsers at the configuration URL" do
+  it 'should open watir browsers at the configuration URL' do
     browser = stub_browser
     browser.expects(:goto).with('a_url')
     Taza::Browser.stubs(:create).returns(browser)
@@ -46,37 +48,36 @@ describe Taza::Site do
     Foo.new
   end
 
-  it "should yield an instance of a page class" do
+  it 'should yield an instance of a page class' do
     f = Foo.new(:browser => stub_browser)
     barzor = nil
     f.bar do |bar|
       barzor = bar
     end
-    barzor.should be_an_instance_of(Bar)
+    expect(barzor).to be_an_instance_of Bar
   end
 
-  it "should accept a browser instance" do
+  it 'should accept a browser instance' do
     browser = stub_browser
     foo = Foo.new(:browser => browser)
-    foo.browser.should eql(browser)
-
+    expect(foo.browser).to eql browser
   end
 
-  it "should create a browser instance if one is not provided" do
+  it 'should create a browser instance if one is not provided' do
     browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     foo = Foo.new
-    foo.browser.should eql(browser)
+    expect(foo.browser).to eql browser
   end
 
-  it "should still close browser if an error is raised" do
+  it 'should still close browser if an error is raised' do
     browser = stub_browser
     browser.expects(:close)
     Taza::Browser.stubs(:create).returns(browser)
-    lambda { Foo.new { |site| raise StandardError}}.should raise_error
+    expect(lambda { Foo.new { |site| raise StandardError } }).to raise_error(StandardError)
   end
 
-  it "should not close browser if block not given" do
+  it 'should not close browser if block not given' do
     browser = stub
     browser.stubs(:goto)
     browser.expects(:close).never
@@ -84,29 +85,29 @@ describe Taza::Site do
     Foo.new
   end
 
-  it "should not close browser if an error is raised on browser goto" do
+  it 'should not close browser if an error is raised on browser goto' do
     browser = Object.new
-    browser.stubs(:goto).raises(StandardError,"ErrorOnBrowserGoto")
+    browser.stubs(:goto).raises(StandardError, 'ErrorOnBrowserGoto')
     browser.expects(:close).never
     Taza::Browser.stubs(:create).returns(browser)
-    lambda { Foo.new }.should raise_error(StandardError,"ErrorOnBrowserGoto")
+    expect(lambda { Foo.new }).to raise_error(StandardError, 'ErrorOnBrowserGoto')
   end
 
-  it "should raise browser close error if no other errors" do
+  it 'should raise browser close error if no other errors' do
     browser = stub_browser
-    browser.expects(:close).raises(StandardError,"BrowserCloseError")
+    browser.expects(:close).raises(StandardError, 'BrowserCloseError')
     Taza::Browser.stubs(:create).returns(browser)
-    lambda { Foo.new {}}.should raise_error(StandardError,"BrowserCloseError")
+    expect(lambda { Foo.new {} }).to raise_error(StandardError, 'BrowserCloseError')
   end
 
-  it "should raise error inside block if both it and browser.close throws an error" do
+  it 'should raise error inside block if both it and browser.close throws an error' do
     browser = stub_browser
-    browser.expects(:close).raises(StandardError,"BrowserCloseError")
+    browser.expects(:close).raises(StandardError, 'BrowserCloseError')
     Taza::Browser.stubs(:create).returns(browser)
-    lambda { Foo.new { |site| raise StandardError, "innererror" }}.should raise_error(StandardError,"innererror")
+    expect(lambda { Foo.new { |site| raise StandardError, 'innererror' } }).to raise_error(StandardError, 'innererror')
   end
 
-  it "should close a browser if block given" do
+  it 'should close a browser if block given' do
     browser = stub_browser
     browser.expects(:close)
     Taza::Browser.stubs(:create).returns(browser)
@@ -114,41 +115,41 @@ describe Taza::Site do
     end
   end
 
-  it "should yield itself upon initialization" do
+  it 'should yield itself upon initialization' do
     Taza::Browser.stubs(:create).returns(stub_browser)
     foo = nil
     f = Foo.new do |site|
       foo = site
     end
-    foo.should eql(f)
+    expect(foo).to eql f
   end
 
-  it "should yield after page methods have been setup" do
+  it 'should yield after page methods have been setup' do
     Taza::Browser.stubs(:create).returns(stub_browser)
     klass = Class::new(Taza::Site)
     klass.any_instance.stubs(:pages_path).returns(@pages_path)
     klass.new do |site|
-      site.should respond_to(:bar)
+      expect(site).to respond_to :bar
     end
   end
 
-  it "should yield after browser has been setup" do
+  it 'should yield after browser has been setup' do
     Taza::Browser.stubs(:create).returns(stub_browser)
     klass = Class::new(Taza::Site)
     klass.any_instance.stubs(:pages_path).returns(@pages_path)
     klass.new do |site|
-      site.browser.should_not be_nil
+      expect(site.browser).to_not be_nil
     end
   end
 
-  it "should pass its browser instance to its pages " do
+  it 'should pass its browser instance to its pages ' do
     browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     foo = Foo.new
-    foo.bar.browser.should eql(browser)
+    expect(foo.bar.browser).to eql browser
   end
 
-  it "should add partials defined under the pages directory" do
+  it 'should add partials defined under the pages directory' do
     Taza::Browser.stubs(:create).returns(stub_browser)
     klass = Class::new(Taza::Site)
     klass.any_instance.stubs(:pages_path).returns(@pages_path)
@@ -157,9 +158,8 @@ describe Taza::Site do
     end
   end
 
-  it "should have a way to evaluate a block of code before site closes the browser" do
-    browser = stub()
-    browser.stubs(:goto)
+  it 'should have a way to evaluate a block of code before site closes the browser' do
+    browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     browser_state = states('browser_open_state').starts_as('on')
     browser.expects(:close).then(browser_state.is('off'))
@@ -168,37 +168,33 @@ describe Taza::Site do
     Foo.new {}
   end
 
-  it "should have a way to evaluate a block of code before site closes the browser if an error occurs" do
-    browser = stub()
-    browser.stubs(:goto)
+  it 'should have a way to evaluate a block of code before site closes the browser if an error occurs' do
+    browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     browser_state = states('browser_open_state').starts_as('on')
     browser.expects(:close).then(browser_state.is('off'))
     browser.expects(:doit).when(browser_state.is('on'))
     Taza::Site.before_browser_closes { |browser| browser.doit }
-    lambda { Foo.new { |site| raise StandardError, "innererror" }}.should raise_error(StandardError,"innererror")
+    expect(lambda { Foo.new { |site| raise StandardError, 'innererror' } }).to raise_error(StandardError, 'innererror')
   end
 
-  it "should still close its browser if #before_browser_closes raises an exception" do
-    browser = stub()
-    browser.stubs(:goto)
+  it 'should still close its browser if #before_browser_closes raises an exception' do
+    browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     browser.expects(:close)
     Taza::Site.before_browser_closes { |browser| raise StandardError, 'foo error' }
-    lambda { Foo.new {} }.should raise_error(StandardError,'foo error')
+    expect(lambda { Foo.new {} }).to raise_error(StandardError, 'foo error')
   end
 
-  it "should not close a browser it did not make" do
-    browser = stub()
-    browser.stubs(:goto)
+  it 'should not close a browser it did not make' do
+    browser = stub_browser
     browser.expects(:close).never
     Foo.new(:browser => browser) {}
   end
 
-  it "should close a browser it did make" do
-    browser = stub()
+  it 'should close a browser it did make' do
+    browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
-    browser.stubs(:goto)
     browser.expects(:close)
     Foo.new() {}
   end
@@ -209,46 +205,45 @@ describe Taza::Site do
     end
   end
 
-  it "should pass in the class name to settings config" do
-    browser = stub()
-    browser.stubs(:goto)
+  it 'should pass in the class name to settings config' do
+    browser = stub_browser
     Taza::Browser.stubs(:create).returns(browser)
     Taza::Settings.expects(:config).with('Zoro').returns({})
     Zoro::Zoro.new
   end
 
-  it "should load settings based on the sites class name" do
+  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 = stub
     browser.stubs(:close)
     browser.stubs(:goto)
     browser
   end
 
-  it "should yield an instance of page class that can access page-module specific elements" do
+  it 'should yield an instance of page class that can access page-module specific elements' do
     f = Foo.new(:browser => stub_browser)
     barzor = nil
     f.baz(:module) do |baz|
       barzor = baz
     end
-    barzor.should be_an_instance_of(Baz)
-    barzor.some_element.should eql(:some_element_value)
+    expect(barzor).to be_an_instance_of Baz
+    expect(barzor.some_element).to eql :some_element_value
   end
 
-  it "should raise an error when accessing an element that belongs to another module" do
+  it 'should raise an error when accessing an element that belongs to another module' do
     f = Foo.new(:browser => stub_browser)
     barzor = nil
     f.baz(:another_module) do |baz|
       barzor = baz
     end
-    lambda{barzor.other_element}.should raise_error(NoMethodError)
+    expect(lambda { barzor.other_element }).to raise_error(NoMethodError)
   end
 
-  it "should have a way to keep the browser instance open" do
+  it 'should have a way to keep the browser instance open' do
     browser = stub_browser
     browser.expects(:close).never
     Taza::Browser.stubs(:create).returns(browser)
@@ -256,11 +251,11 @@ describe Taza::Site do
     Foo.new {}
   end
 
-  it "should have a way to keep the browser instance open if an error is raised" do
+  it 'should have a way to keep the browser instance open if an error is raised' do
     browser = stub_browser
     browser.expects(:close).never
     Taza::Browser.stubs(:create).returns(browser)
     Taza::Site.donot_close_browser
-    lambda { Foo.new { |site| raise StandardError}}.should raise_error
+    expect(lambda { Foo.new { |site| raise StandardError } }).to raise_error(StandardError)
   end
 end

data/spec/taza/string_spec.rb

@@ -3,10 +3,10 @@ require 'extensions/string'
 
 describe "string extensions" do
   it "should pluralize and to sym a string" do
-    "apple".pluralize_to_sym.should eql(:apples)
+    expect("apple".pluralize_to_sym).to eql :apples
   end
 
   it "should variablize words with spaces" do
-    "foo -  BAR".variablize.should eql("foo_bar")
+    expect("foo -  BAR".variablize).to eql 'foo_bar'
   end
 end

data/taza.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |s|
   s.executables           = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths         = ["lib"]
 
-  s.add_runtime_dependency(%q<rake>, ["~> 0.9.2"])
-  s.add_runtime_dependency(%q<mocha>, ["~> 0.9.3"])
-  s.add_runtime_dependency(%q<rspec>, ["~> 2.6"])
+  s.add_runtime_dependency(%q<rake>, [">= 0.9.2"])
+  s.add_runtime_dependency(%q<mocha>, [">= 0.9.3"])
   s.add_runtime_dependency(%q<user-choices>, ["~> 1.1.6.1"])
   s.add_runtime_dependency(%q<Selenium>, ["~> 1.1.14"])
   s.add_runtime_dependency(%q<firewatir>, ["~> 1.9.4"])
   s.add_runtime_dependency(%q<watir-webdriver>, ["~> 0.4"])
+  s.add_runtime_dependency(%q<watir>, ["~> 5.0.0"])
   s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
   s.add_runtime_dependency(%q<thor>, [">= 0.18.1"])
+  s.add_runtime_dependency(%q<rspec>, ["~> 3.0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taza
 version: !ruby/object:Gem::Version
-  version: 0.9.2.1
+  version: '1.0'
 platform: ruby
 authors:
 - Adam Anderson
@@ -10,134 +10,148 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: user-choices
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.6.1
 - !ruby/object:Gem::Dependency
   name: Selenium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.14
 - !ruby/object:Gem::Dependency
   name: firewatir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.9.4
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: watir
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Taza is an opinionated page object framework.
 email:
 - watir-general@googlegroups.com
@@ -146,9 +160,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rvmrc"
-- ".travis.yml"
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - History.txt
 - Manifest.txt
@@ -162,7 +177,6 @@ files:
 - lib/extensions/string.rb
 - lib/formatters/failing_examples_formatter.rb
 - lib/taza.rb
-- lib/taza.rb.backup
 - lib/taza/browser.rb
 - lib/taza/entity.rb
 - lib/taza/fixture.rb
@@ -237,17 +251,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: taza
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Taza is an opinionated page object framework.