howitzer 2.0.1 → 2.0.2

data/spec/unit/lib/web/page_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Howitzer::Web::Page do
             .with("Open #{described_class} page by '#{url_value}' url").once.ordered
           expect(described_class).to receive(:retryable).ordered.once.and_call_original
           expect(session).to receive(:visit).with(url_value).once.ordered
-          expect(described_class).to receive(:given).once.ordered { true }
+          expect(described_class).to receive(:given).once.ordered.and_return(true)
           expect(subject).to eq(true)
         end
       end
@@ -33,7 +33,7 @@ RSpec.describe Howitzer::Web::Page do
             .with("Open #{described_class} page by '#{url_value}' url").once.ordered
           expect(described_class).to receive(:retryable).ordered.once.and_call_original
           expect(session).to receive(:visit).with(url_value).once.ordered
-          expect(described_class).to receive(:given).once.ordered { true }
+          expect(described_class).to receive(:given).once.ordered.and_return(true)
           expect(subject).to eq(true)
         end
       end
@@ -41,12 +41,12 @@ RSpec.describe Howitzer::Web::Page do
         let(:url_value) { 'http://example.com/users' }
         subject { described_class.open }
         it do
-          expect(described_class).to receive(:expanded_url).with({}, nil) { url_value }.once.ordered
+          expect(described_class).to receive(:expanded_url).with({}, nil).and_return(url_value).once.ordered
           expect(Howitzer::Log).to receive(:info)
             .with("Open #{described_class} page by '#{url_value}' url").once.ordered
           expect(described_class).to receive(:retryable).ordered.once.and_call_original
           expect(session).to receive(:visit).with(url_value).once.ordered
-          expect(described_class).to receive(:given).once.ordered { true }
+          expect(described_class).to receive(:given).once.ordered.and_return(true)
           expect(subject).to eq(true)
         end
       end
@@ -55,7 +55,7 @@ RSpec.describe Howitzer::Web::Page do
       let(:url_value) { 'http://example.com/users' }
       subject { described_class.open(validate: false) }
       it do
-        expect(described_class).to receive(:expanded_url).with({}, nil) { url_value }.once.ordered
+        expect(described_class).to receive(:expanded_url).with({}, nil).and_return(url_value).once.ordered
         expect(Howitzer::Log).to receive(:info).with("Open #{described_class} page by '#{url_value}' url").once.ordered
         expect(described_class).to receive(:retryable).ordered.once.and_call_original
         expect(session).to receive(:visit).with(url_value).once.ordered
@@ -67,11 +67,11 @@ RSpec.describe Howitzer::Web::Page do
       let(:url_value) { 'http://example.com/users/1' }
       subject { described_class.open(validate: true, id: 1) }
       it do
-        expect(described_class).to receive(:expanded_url).with({ id: 1 }, nil) { url_value }.once.ordered
+        expect(described_class).to receive(:expanded_url).with({ id: 1 }, nil).and_return(url_value).once.ordered
         expect(Howitzer::Log).to receive(:info).with("Open #{described_class} page by '#{url_value}' url").once.ordered
         expect(described_class).to receive(:retryable).ordered.once.and_call_original
         expect(session).to receive(:visit).with(url_value).once.ordered
-        expect(described_class).to receive(:given).once.ordered { true }
+        expect(described_class).to receive(:given).once.ordered.and_return(true)
         expect(subject).to eq(true)
       end
     end
@@ -81,7 +81,7 @@ RSpec.describe Howitzer::Web::Page do
     subject { described_class.given }
     before do
       expect(described_class).to receive(:displayed?).with(no_args).once
-      expect(described_class).to receive(:instance) { true }
+      expect(described_class).to receive(:instance).and_return(true)
     end
     it { is_expected.to be_truthy }
   end
@@ -90,8 +90,8 @@ RSpec.describe Howitzer::Web::Page do
     let(:page) { double }
     subject { described_class.instance.title }
     before do
-      allow_any_instance_of(described_class).to receive(:check_validations_are_defined!) { true }
-      allow(session).to receive(:current_url) { 'google.com' }
+      allow_any_instance_of(described_class).to receive(:check_validations_are_defined!).and_return(true)
+      allow(session).to receive(:current_url).and_return('google.com')
     end
     it do
       expect(session).to receive(:title)
@@ -102,17 +102,17 @@ RSpec.describe Howitzer::Web::Page do
   describe '.current_page' do
     subject { described_class.current_page }
     context 'when matched_pages has no pages' do
-      before { allow(described_class).to receive(:matched_pages) { [] } }
+      before { allow(described_class).to receive(:matched_pages).and_return([]) }
       it { is_expected.to eq(described_class::UnknownPage) }
     end
     context 'when matched_pages has more than 1 page' do
       let(:foo_page) { double(inspect: 'FooPage') }
       let(:bar_page) { double(inspect: 'BarPage') }
       before do
-        allow_any_instance_of(described_class).to receive(:check_validations_are_defined!) { true }
-        allow(session).to receive(:current_url) { 'http://test.com' }
+        allow_any_instance_of(described_class).to receive(:check_validations_are_defined!).and_return(true)
+        allow(session).to receive(:current_url).and_return('http://test.com')
         allow(session).to receive(:title) { 'Test site' }
-        allow(described_class).to receive(:matched_pages) { [foo_page, bar_page] }
+        allow(described_class).to receive(:matched_pages).and_return([foo_page, bar_page])
       end
       it do
         expect { subject }.to raise_error(
@@ -124,7 +124,7 @@ RSpec.describe Howitzer::Web::Page do
     end
     context 'when matched_pages has only 1 page' do
       let(:foo_page) { double(to_s: 'FooPage') }
-      before { allow(described_class).to receive(:matched_pages) { [foo_page] } }
+      before { allow(described_class).to receive(:matched_pages).and_return([foo_page]) }
       it { is_expected.to eq(foo_page) }
     end
   end
@@ -132,15 +132,15 @@ RSpec.describe Howitzer::Web::Page do
   describe '.displayed?' do
     subject { described_class.displayed? }
     context 'when page is opened' do
-      before { allow(described_class).to receive(:opened?) { true } }
+      before { allow(described_class).to receive(:opened?).and_return(true) }
       it { is_expected.to eq(true) }
     end
     context 'when page is not opened' do
       before do
-        allow(described_class).to receive(:current_page) { 'FooPage' }
-        allow(session).to receive(:current_url) { 'http://test.com' }
-        allow(session).to receive(:title) { 'Test site' }
-        allow(described_class).to receive(:opened?) { false }
+        allow(described_class).to receive(:current_page).and_return('FooPage')
+        allow(session).to receive(:current_url).and_return('http://test.com')
+        allow(session).to receive(:title).and_return('Test site')
+        allow(described_class).to receive(:opened?).and_return(false)
       end
       it do
         expect { subject }.to raise_error(
@@ -153,7 +153,7 @@ RSpec.describe Howitzer::Web::Page do
   end
 
   describe '.current_url' do
-    before { allow(Capybara).to receive_message_chain(:current_session, :current_url) { 'http://example.com' } }
+    before { allow(Capybara).to receive_message_chain(:current_session, :current_url).and_return('http://example.com') }
     it 'should return current url page' do
       expect(Howitzer::Web::Page.current_url).to eq('http://example.com')
     end
@@ -286,7 +286,7 @@ RSpec.describe Howitzer::Web::Page do
   describe '#initialize' do
     subject { described_class.send(:new) }
     before do
-      expect_any_instance_of(described_class).to receive(:check_validations_are_defined!).once { true }
+      expect_any_instance_of(described_class).to receive(:check_validations_are_defined!).once.and_return(true)
     end
     context 'when maximized_window is true' do
       let(:driver) { double }
@@ -317,10 +317,10 @@ RSpec.describe Howitzer::Web::Page do
     subject { described_class.instance.reload }
     let(:visit) { double }
     before do
-      allow(session).to receive(:current_url) { 'google.com' }
+      allow(session).to receive(:current_url).and_return('google.com')
     end
     it do
-      expect(Howitzer::Log).to receive(:info) { "Reload 'google.com'" }
+      expect(Howitzer::Log).to receive(:info).and_return("Reload 'google.com'")
       expect(session).to receive(:visit).with('google.com')
       subject
     end
@@ -328,7 +328,7 @@ RSpec.describe Howitzer::Web::Page do
 
   describe '#capybara_context' do
     subject { described_class.instance.capybara_context }
-    before { expect(Capybara).to receive(:current_session) { :context } }
+    before { expect(Capybara).to receive(:current_session).and_return(:context) }
     it { is_expected.to eq(:context) }
   end
 

data/spec/unit/lib/web/page_validator_spec.rb

@@ -11,6 +11,8 @@ RSpec.describe Howitzer::Web::PageValidator do
     Class.new do
       include Howitzer::Web::ElementDsl
       include Howitzer::Web::PageValidator
+      element :foo, 'a'
+      element :bar, :xpath, ->(v) { v }
       def self.name
         'TestWebPageClass'
       end
@@ -42,14 +44,14 @@ RSpec.describe Howitzer::Web::PageValidator do
     context 'when element_presence validation is specified' do
       context 'when simple selector' do
         before do
-          web_page.class.validate :element_presence, :test_locator
+          web_page.class.validate :element_presence, :foo
         end
         it { expect { subject }.to_not raise_error }
       end
 
       context 'when lambda selector' do
         before do
-          web_page.class.validate :element_presence, :test_locator, 'some_text'
+          web_page.class.validate :element_presence, :bar, 'some_text'
         end
         it { expect { subject }.to_not raise_error }
       end
@@ -66,13 +68,13 @@ RSpec.describe Howitzer::Web::PageValidator do
       context 'as string' do
         let(:name) { 'url' }
         context '(as string)' do
-          let(:value) { /foo/ }
+          let(:value) { 'foo' }
           it do
             is_expected.to be_a(Proc)
             expect(described_class.validations[web_page.class][:url]).to be_a Proc
           end
         end
-        context '(as symbol)' do
+        context '(as regexp)' do
           let(:value) { /foo/ }
           it do
             is_expected.to be_a(Proc)
@@ -92,7 +94,7 @@ RSpec.describe Howitzer::Web::PageValidator do
     context 'when name = :element_presence' do
       let(:name) { :element_presence }
       context '(as string)' do
-        let(:value) { 'test_locator' }
+        let(:value) { 'bar' }
         let(:additional_value) { 'some string' }
         it do
           is_expected.to be_a(Proc)
@@ -100,23 +102,36 @@ RSpec.describe Howitzer::Web::PageValidator do
         end
       end
       context '(as symbol)' do
-        let(:value) { :test_locator }
+        let(:value) { :foo }
         it do
           is_expected.to be_a(Proc)
           expect(described_class.validations[web_page.class][:element_presence]).to eql(subject)
         end
       end
+
+      context 'when refers to unknown element' do
+        let(:value) { :unknown }
+        it do
+          subject
+          expect do
+            described_class.validations[web_page.class][:element_presence].call(web_page, false)
+          end.to raise_error(
+            Howitzer::UndefinedElementError,
+            ":element_presence validation refers to undefined 'unknown' element on 'TestWebPageClass' page."
+          )
+        end
+      end
     end
     context 'when name = :title' do
       let(:name) { :title }
       context '(as string)' do
-        let(:value) { /foo/ }
+        let(:value) { 'foo' }
         it do
           is_expected.to be_a(Proc)
           expect(described_class.validations[web_page.class][:title]).to be_a Proc
         end
       end
-      context '(as symbol)' do
+      context '(as regexp)' do
         let(:value) { /foo/ }
         it do
           is_expected.to be_a(Proc)
@@ -157,15 +172,15 @@ RSpec.describe Howitzer::Web::PageValidator do
         end
         context 'when all matches' do
           before do
-            allow(web_page_class.instance).to receive(:current_url) { 'http://test.com/foo' }
-            allow(web_page_class.instance).to receive(:has_title?) { 'Foo page' }
-            allow(web_page_class.instance).to receive(:has_login_element?).with(no_args) { true }
+            allow(web_page_class.instance).to receive(:current_url).and_return('http://test.com/foo')
+            allow(web_page_class.instance).to receive(:has_title?).and_return('Foo page')
+            allow(web_page_class.instance).to receive(:has_login_element?).with(no_args).and_return(true)
           end
           it { is_expected.to be_truthy }
         end
         context 'when first validation fails' do
           before do
-            expect(web_page_class.instance).to receive(:current_url).once { 'http://test.com/bar' }
+            expect(web_page_class.instance).to receive(:current_url).once.and_return('http://test.com/bar')
             expect(web_page_class.instance).to receive(:has_title?).never
             allow(web_page_class).to receive(:has_login_element?).with(no_args).never
           end
@@ -186,15 +201,15 @@ RSpec.describe Howitzer::Web::PageValidator do
         end
         context 'when all matches' do
           before do
-            allow(web_page_class.instance).to receive(:current_url) { 'http://test.com/foo' }
-            allow(web_page_class.instance).to receive(:has_title?) { 'Foo page' }
-            allow(web_page_class.instance).to receive(:has_login_element?).with(no_args) { true }
+            allow(web_page_class.instance).to receive(:current_url).and_return('http://test.com/foo')
+            allow(web_page_class.instance).to receive(:has_title?).and_return('Foo page')
+            allow(web_page_class.instance).to receive(:has_login_element?).with(no_args).and_return(true)
           end
           it { is_expected.to be_truthy }
         end
         context 'when first validation fails' do
           before do
-            expect(web_page_class.instance).to receive(:current_url).once { 'http://test.com/bar' }
+            expect(web_page_class.instance).to receive(:current_url).once.and_return('http://test.com/bar')
             expect(web_page_class.instance).to receive(:has_title?).never
             allow(web_page_class).to receive(:has_login_element?).with(no_args).never
           end
@@ -215,15 +230,15 @@ RSpec.describe Howitzer::Web::PageValidator do
         end
         context 'when all matches' do
           before do
-            allow(web_page_class.instance).to receive(:current_url) { 'http://test.com/foo' }
-            allow(web_page_class.instance).to receive(:title) { 'Foo page' }
-            allow(web_page_class.instance).to receive(:has_no_login_element?).with(no_args) { false }
+            allow(web_page_class.instance).to receive(:current_url).and_return('http://test.com/foo')
+            allow(web_page_class.instance).to receive(:title).and_return('Foo page')
+            allow(web_page_class.instance).to receive(:has_no_login_element?).with(no_args).and_return(false)
           end
           it { is_expected.to be_truthy }
         end
         context 'when first validation fails' do
           before do
-            expect(web_page_class.instance).to receive(:current_url).once { 'http://test.com/bar' }
+            expect(web_page_class.instance).to receive(:current_url).once.and_return('http://test.com/bar')
             expect(web_page_class.instance).to receive(:title).never
             allow(web_page_class).to receive(:has_no_login_element?).with(no_args).never
           end
@@ -253,8 +268,8 @@ RSpec.describe Howitzer::Web::PageValidator do
       allow(Howitzer::Web::PageValidator).to receive(:validations).with(no_args) do
         { web_page1_class => 1, web_page2_class => 2 }
       end
-      expect(web_page1_class).to receive(:opened?).with(sync: false) { true }
-      expect(web_page2_class).to receive(:opened?).with(sync: false) { false }
+      expect(web_page1_class).to receive(:opened?).with(sync: false).and_return(true)
+      expect(web_page2_class).to receive(:opened?).with(sync: false).and_return(false)
     end
     it { is_expected.to eq([web_page1_class]) }
   end

data/spec/unit/lib/web/section_dsl_spec.rb

@@ -148,9 +148,9 @@ RSpec.describe Howitzer::Web::SectionDsl do
         let(:context3) { double }
         let(:capybara_element) { double }
         before do
-          expect(session).to receive(:find).with(*finder_args).once { context2 }
-          expect(context2).to receive(:find).with('#klass') { context3 }
-          expect(context3).to receive(:find).with(:xpath, './/a') { capybara_element }
+          expect(session).to receive(:find).with(*finder_args).once.and_return(context2)
+          expect(context2).to receive(:find).with('#klass').and_return(context3)
+          expect(context3).to receive(:find).with(:xpath, './/a').and_return(capybara_element)
         end
 
         it 'can work with nested section' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: howitzer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Roman Parashchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,20 +114,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-wait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sexy_settings
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +252,7 @@ files:
 - generators/cucumber/cucumber_generator.rb
 - generators/cucumber/templates/common_steps.rb
 - generators/cucumber/templates/cucumber.rake
+- generators/cucumber/templates/cuke_sniffer.rake
 - generators/cucumber/templates/env.rb
 - generators/cucumber/templates/example.feature
 - generators/cucumber/templates/hooks.rb
@@ -360,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Ruby based framework for acceptance testing