watirmark 5.28.2 → 5.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df6f52af72e6865375e5d300d361e426812e09f0
-  data.tar.gz: 641fdc217abd970ff0c143c974720f3cc20a7185
+  metadata.gz: 869eb50af6ffc0f094ab946ce3a02e65300f0cf5
+  data.tar.gz: cb1343978e8f19130cefe1da8ddaa3b9e1a9b469
 SHA512:
-  metadata.gz: 5eb5c8a47a4b4fdc9cd7ac2e4174342837a9e1b53671fa6fc1c9d7d14f3118a7e487dd93110d6a3a49659d3ca41bbb9e5f1e02c21f8b641f6c220fd758f16d0c
-  data.tar.gz: 2234f957ac4b12d63b43476f389cdefec566d41a6578f0975785e59d5a4fbbc7838f22b91f78c92e346d4e01b744515611b635dd8f8253a1a339bcddcf982964
+  metadata.gz: 31406663981f396d3660f6785f46a5f63c75dab98d847a7262c5fd3b35a9c2efda3ed5210efba9b6f171f646182d930494f3cc8781fe29a645e87b45f861a5d9
+  data.tar.gz: 54971e2d3debcb65fca67e92faab264b339601f528c57af641f065b888a17e5574af87ca13748f9188b272af2e1499853f2de5dcbd388e446b7650131412bb99

data/bin/firefox_extensions/firebug/README.md

@@ -0,0 +1 @@
+Set :firebug to true in config file to automatically download and use latest version of Firebug extension for Firefox

data/lib/watirmark/configuration.rb

@@ -27,6 +27,7 @@ module Watirmark
         :prefer_css         => false,
         :watir_timeout      => 30,
         :http_timeout       => 60,
+        :firebug            => false,
         # database
         :dbhostname         => nil,
         :dbusername         => nil,

data/lib/watirmark/controller/actions.rb

@@ -48,7 +48,8 @@ module Watirmark
     def edit
       search_for_record
       @view.edit @model
-      populate_data
+      populate_data(@model.updates)
+      @model.clear_updates
       check_for_noop_populate
     end
 

data/lib/watirmark/controller/controller.rb

@@ -38,14 +38,14 @@ module Watirmark
         initialize_model(data)
       end
 
-      def populate_data
-        submit_process_page(@last_process_page.underscored_name) {submit} if populate_values
+      def populate_data(updates=nil)
+        submit_process_page(@last_process_page.underscored_name) {submit} if populate_values(updates)
       end
 
-      def populate_values
+      def populate_values(updates=nil)
         @seen_value = false
         @last_process_page = nil
-        keyed_elements.each do |k|
+        keyed_update_elements(updates).each do |k|
           next unless k.populate_allowed?
           submit_process_page_when_page_changes(k)
           before_process_page(k)
@@ -123,7 +123,7 @@ module Watirmark
 
       def populate_keyword_value(keyed_element)
         call_method_if_exists("populate_#{keyed_element.keyword}") do
-          @view.send(keyed_element.keyword).wait_until_present unless @view.send(keyed_element.keyword).kind_of? Watir::Radio
+          @view.send(keyed_element.keyword).wait_until_present
           @view.send("#{keyed_element.keyword}=", value(keyed_element))
         end
       end
@@ -159,6 +159,11 @@ module Watirmark
         @view.keyed_elements.select{|e| !value(e).nil?}
       end
 
+      def keyed_update_elements(updates)
+        Watirmark.logger.info("Editing these keyword(s) in populate_data: #{updates}") unless updates.nil? || updates.empty?
+        keyed_elements.select{|k| updates.nil? || updates.include?(k.keyword) }
+      end
+
       def locate_model(supermodel)
         case supermodel
           when Hash

data/lib/watirmark/cucumber/hook_helper.rb

@@ -10,12 +10,20 @@ module HookHelper
     end
 
 
-    def take_screenshot
-      image = "#{Time.now.to_i}-#{UUID.new.generate(:compact)}.png"
-      path = "reports/screenshots"
+    def take_screenshot(folder='', feature='')
+      path = "reports/screenshots/#{folder}"
+      if folder.empty?
+        image = "#{Time.now.to_i}-#{UUID.new.generate(:compact)}.png"
+      else
+        image = "#{feature}.png"
+      end
       file = "#{path}/#{image}"
       FileUtils.mkdir_p path unless File.directory? path
       begin
+        if Page.browser.alert.exists?
+          Watirmark.logger.warn("Alert is Open while taking screenshot: #{Page.browser.alert.text}")
+          Page.browser.alert.close
+        end
         Page.browser.screenshot.save file
         data = File.open(file, 'rb') { |f| f.read }
         data = Base64.encode64(data)

data/lib/watirmark/cucumber/hooks.rb

@@ -13,9 +13,16 @@ Before do |scenario|
 end
 
 After do |scenario|
-  (file, file_type) = HookHelper.take_screenshot
+  if scenario.passed?
+    prepend = 'p_'
+  elsif scenario.failed?
+    prepend = 'f_'
+  else
+    prepend = 'i_'
+  end
+  folder = scenario.location.to_s[/\/features\/([^\.]*)/, 1]
+  feature = prepend+scenario.title.tr(' ', '_')
+  (file, file_type) = HookHelper.take_screenshot(folder, feature)
   embed file, file_type
   HookHelper.serialize_models
 end
-
-

data/lib/watirmark/cucumber/model_helper.rb

@@ -20,15 +20,9 @@ module ModelHelper
 # Perform an action using a models and update
 # the models if that action is successful
   def with_model(model, table)
-    orig_model = model.clone
-    update_model(model, table)
+    cloned_model = model.clone
+    update_model(cloned_model, table)
     yield
-    if Watirmark::Session.instance.post_failure
-      Watirmark.logger.info  "Reverting Model #{Watirmark::Session.instance.post_failure}"
-      model.update(orig_model.to_h) # revert models on failure
-    elsif model.to_h != orig_model.to_h
-      Watirmark.logger.info "Updated model '#{model.model_name}' #{hash_record(table).inspect}"
-    end
   end
 end
 

data/lib/watirmark/models/factory.rb

@@ -15,7 +15,7 @@ module Watirmark
       include FactoryMethodGenerators
 
       attr_accessor :defaults, :model_name, :models, :parent, :children, :model_type
-      attr_reader   :keywords
+      attr_reader   :keywords, :updates
 
       def marshal_dump
         [@keywords, @model_name, @models, @parent, @children, @model_type, self.to_h]
@@ -33,6 +33,7 @@ module Watirmark
         @search     = self.class.search || Proc.new{nil}
         @keywords   = self.class.keys.dup || []
         @children   = self.class.children.dup.map(&:new)
+        @updates    = []
         set_model_name
         set_default_values
         create_model_getters_and_setters
@@ -106,11 +107,18 @@ module Watirmark
       # Update the model using the provided hash
       def update hash
         remove_empty_entries hash
-        hash.each_pair { |key, value| send "#{key}=", value }
+        hash.each_pair do |key, value|
+          @updates << key
+          send "#{key}=", value
+        end
         self
       end
       alias :has :update
 
+      def clear_updates
+        @updates = []
+      end
+
 
       # Update the model using the provided hash but only if exists (TODO: may not be needed any more)
       def update_existing_members hash

data/lib/watirmark/session.rb

@@ -94,6 +94,19 @@ module Watirmark
         profile['security.warn_viewing_mixed.show_once'] =  false
         profile['security.mixed_content.block_active_content'] = false
       end
+      if config.firebug
+        unless RbConfig::CONFIG['host_os'].match('linux')
+          warn "Firebug with Firefox only supported on Linux"
+          return
+        end
+        path = (File.expand_path "../../../bin/firefox_extensions/firebug", __FILE__)
+        file = 'addon-1843-latest.xpi'
+        Dir.chdir(path) do
+          File.delete(file) if File.exists?(file)
+          `wget https://addons.mozilla.org/firefox/downloads/latest/1843/addon-1843-latest.xpi`
+        end
+        profile.add_extension("#{path}/#{file}")
+      end
       profile["focusmanager.testmode"] = true
       profile
     end

data/lib/watirmark/version.rb

@@ -1,5 +1,5 @@
 module Watirmark
   module Version
-    STRING = '5.28.2'
+    STRING = '5.29.0'
   end
 end

data/spec/controller_actions_spec.rb

@@ -151,4 +151,60 @@ describe Watirmark::Actions do
   it 'should not throw an exception if populate_data is overridden' do
     lambda { ControllerActionsTest::ActionCreateControllerWithOverride.new.create }.should_not raise_error
   end
+
+  describe 'Controllers will only populate newly updated values in the model' do
+
+    before(:all) do
+      class TestEditView < Page
+        keyword(:edit_test) {}
+        keyword(:edit_test_two) {}
+        def create(model); end
+        def edit(model); end
+      end
+      class TestEditController < Watirmark::WebPage::Controller
+        @view = TestEditView
+        def populate_edit_test; end
+        def populate_edit_test_two; end
+      end
+      class TestEditModel < Watirmark::Model::Factory
+        keywords :edit_test
+        defaults do
+          edit_test { true }
+        end
+      end
+    end
+
+    specify 'populate_data populates keywords that have not been populated before' do
+      model = TestEditModel.new
+      c = TestEditController.new(model)
+      model.update(edit_test: true)
+      c.expects(:populate_edit_test).once
+      c.run :edit
+      c.run :edit
+      c.run :edit
+      model.update(edit_test_two: true)
+      c.expects(:populate_edit_test_two).once
+      c.run :edit
+      c.run :edit
+      c.run :edit
+    end
+
+    specify 'create should populate every time regardless of model updates' do
+      model = TestEditModel.new
+      c = TestEditController.new(model)
+      c.expects(:populate_edit_test).twice
+      c.run :create
+      c.run :create
+    end
+
+    specify 'create should populate every time even when the model is updated' do
+      model = TestEditModel.new
+      c = TestEditController.new(model)
+      c.expects(:populate_edit_test).twice
+      c.run :create
+      model.update(edit_test_two: true)
+      c.expects(:populate_edit_test_two).once
+      c.run :create
+    end
+  end
 end

data/spec/model_factory_spec.rb

@@ -99,6 +99,20 @@ describe "#update" do
     lambda{keys.update('   '.to_sym=>'') }.should_not raise_error
   end
 
+  specify "model #updates hash is updated when any keywords in the model is updated" do
+    keys = FactoryTest::UpdateModel.new
+    keys.update(:username=>'username', :foo=>'foo')
+    expect(keys.updates).to include(:username)
+    expect(keys.updates).to include(:foo)
+  end
+
+  specify "model #updates hash is cleared when #clear_updates is called" do
+    keys = FactoryTest::UpdateModel.new
+    keys.update(:username=>'username', :foo=>'foo')
+    keys.clear_updates
+    expect(keys.updates).to be_empty
+  end
+
 end
 
 describe "defaults" do
@@ -489,7 +503,7 @@ end
 describe "keywords" do
   before :all do
     module FactoryTest
-      class Element
+      class ElementTest
         attr_accessor :value
 
         def initialize(x)
@@ -498,9 +512,9 @@ describe "keywords" do
       end
 
       class SomeView < Page
-        keyword(:first_name)  { Element.new :a }
-        keyword(:middle_name) { Element.new :b }
-        keyword(:last_name)   { Element.new :c }
+        keyword(:first_name)  { ElementTest.new :a }
+        keyword(:middle_name) { ElementTest.new :b }
+        keyword(:last_name)   { ElementTest.new :c }
       end
 
       class SomeModel < Watirmark::Model::Factory

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: watirmark
 version: !ruby/object:Gem::Version
-  version: 5.28.2
+  version: 5.29.0
 platform: ruby
 authors:
 - Hugh McGowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: american_date
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: headless
   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'
 description: Watirmark is an MVC test framework for watir-webdriver
@@ -129,6 +129,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/firefox_extensions/firebug/README.md
 - bin/watirmark
 - generators/new_project/generator.rb
 - generators/new_project/templates/config.yml.erb
@@ -218,32 +219,32 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: watirmark 5.28.2
+summary: watirmark 5.29.0
 test_files:
+- spec/model_traits_spec.rb
 - spec/session_spec.rb
-- spec/helper_methods_spec.rb
+- spec/controller_spec.rb
 - spec/controllers_and_models_spec.rb
-- spec/process_page_spec.rb
-- spec/page_spec.rb
-- spec/config_spec.rb
 - spec/model_factory_spec.rb
+- spec/helper_methods_spec.rb
 - spec/controller_actions_spec.rb
-- spec/model_traits_spec.rb
 - spec/watir_webdriver_spec.rb
 - spec/spec_helper.rb
-- spec/controller_spec.rb
+- spec/page_spec.rb
+- spec/process_page_spec.rb
 - spec/assertions_spec.rb
+- spec/config_spec.rb
 has_rdoc: