ole-qa-framework 2.1.0 → 2.1.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### v2.1.1 - 2013/07/16
+
+* Fix Bib Editor
+    * update control field IDs for compatibility with M1-r12784
+* Fix Editor base Class
+    * move message to Bib Editor, span ID is not universal across editor types
+    * update element definitions
+* Helper Modules
+    * don't add element or function to array when force=true
+
 ### v2.1.0 - 2013/07/10
 
 * Login/Logout

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ole-qa-framework (2.1.0)
+    ole-qa-framework (2.1.1)
       headless
       rspec
       watir-webdriver

data/lib/config/default_options.yml

@@ -1,7 +1,8 @@
+# Default options for using development environment.
 ---
-:base_url: http://tst.ole.kuali.org/
-:ls_url: http://tst.rice2.ole.kuali.org/
+:base_url: http://dev.ole.kuali.org/
+:ls_url: http://dev.rice2.ole.kuali.org/
 :headless?: true
 :implicit_wait: 0
 :explicit_wait: 15
-:doc_wait: 45
+:doc_wait: 60

data/lib/config/defaults.yml

@@ -0,0 +1,8 @@
+# Default options for non-development use.
+---
+:base_url: http://tst.ole.kuali.org/
+:ls_url: http://tst.rice2.ole.kuali.org/
+:headless?: true
+:implicit_wait: 0
+:explicit_wait: 15
+:doc_wait: 45

data/lib/config/dev_options.yml

@@ -0,0 +1,8 @@
+# Default options for using development environment.
+---
+:base_url: http://dev.ole.kuali.org/
+:ls_url: http://dev.rice2.ole.kuali.org/
+:headless?: true
+:implicit_wait: 0
+:explicit_wait: 15
+:doc_wait: 60

data/lib/module/qa_helpers.rb

@@ -103,7 +103,7 @@ module OLE_QA::Framework::Helpers
         yield self
       end
     end
-    @elements << name
+    @elements << name unless force
   end
   alias_method(:element, :set_element)
 
@@ -132,7 +132,7 @@ module OLE_QA::Framework::Helpers
         yield *arg
       end
     end
-    @functions << name
+    @functions << name unless force
   end
   alias_method(:function,:set_function)
 

data/lib/ole_qa_framework/COMPATIBILITY.rb

@@ -15,6 +15,6 @@
 module OLE_QA
   module Framework
     # The most recent version of OLE with which this framework is compatible.
-    OLE_VERSION = '0.8.0 - 1.0.0-M1-r12784 2013-07-03'
+    OLE_VERSION = '0.8.0 - 1.0.0-M2-r12961 :: 2013-07-11'
   end
 end

data/lib/ole_qa_framework/VERSION.rb

@@ -15,6 +15,6 @@
 module OLE_QA
   module Framework
     # The version number for this project.
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

data/lib/olels/common/editor.rb

@@ -44,21 +44,19 @@ module OLE_QA::Framework::OLELS
     #   despite their commonality.
     def set_elements
       super
-      element(:title)                           {b.h2(:class => "uif-headerText").span}
-      element(:submit_button)                   {b.button(:id => "submitEditor")}
-      element(:cancel_button)                   {b.button(:id => "cancelEditor")}
-      element(:close_button)                    {b.button(:id => "closeEditor")}
-      element(:return_to_search_button)         {b.button(:id => "returnToSearch_button")}
-      element(:message)                         {b.span(:id => "workMessageSection_span")}
+      element(:title)                               {b.h2(:class => "uif-headerText").span}
+      element(:submit_button)                       {b.button(:id => "submitEditor")}
+      element(:cancel_button)                       {b.button(:id => "cancelEditor")}
+      element(:close_button)                        {b.button(:id => "closeEditor")}
+      element(:return_to_search_button)             {b.button(:id => "returnToSearch_button")}
       # Navigation Area Elements
       # TODO Check on necessity of plurality for add instance button once it is functioning again.  (see OLE-4294)
-      element(:delete_bib_button)                   {b.img(:xpath => "//img[@class='deleteBib']")}
-      element(:holdings_links)                      {b.divs(:class => "holdingIdentifierClass")}
-      element(:item_links)                          {b.divs(:class => "itemIdentifierClass")}
-      element(:add_instance_buttons)                {b.imgs(:class => "addInstance")}
-      element(:delete_instance_buttons)             {b.imgs(:title => "Delete Instance")}
-      element(:add_item_buttons)                    {b.imgs(:title => "Add Item")}
-      element(:delete_item_buttons)                 {b.imgs(:title => "Delete Item")}
+      element(:delete_bib_button)                   {b.div(:id => 'bibLevelActionSection').div(:index => 2).input(:title => "Delete Bib")}
+      element(:add_instance_button)                 {b.div(:id => 'bibLevelActionSection').div(:index => 2).input(:title => "Add Instance")}
+      element(:delete_instance_button)              {b.div(:id => 'vakata-contextmenu').ul.li(:index => 0).a(:rel => "Delete")}
+      # FIXME - Redefine these elements.
+      # element(:add_item_button)                     {b.imgs(:title => "Add Item")}
+      # element(:delete_item_button)                  {b.imgs(:title => "Delete Item")}
     end
 
     # Designate elements always expected to be present once the editor has finished loading.
@@ -71,6 +69,13 @@ module OLE_QA::Framework::OLELS
       super
       # Click the submit button, wait until a message appears, and return the message text.
       function(:save_record)                        {submit_button.click ; message.wait_until_present ; message.text.strip}
+      # Links for Holdings and Item Records - Pass a human-readable (1-based) variable to determine which instance of each link should be used.
+      #   e.g., holdings_link(1) will return the first holdings link, holdings_link(2) will return the second.
+      function(:holdings_link)                      {|which = 1| b.span(:xpath => "//div[@id='holdingsItemTree_tree']/ul[@class='jstree-no-icons']/li[#{which}]/a/span[@class='uif-message']")}
+      function(:holdings_icon)                      {|which = 1| b.ins(:xpath => "//div[@id='holdingsItemTree_tree']/ul[@class='jstree-no-icons']/li[#{which}]/ins")}
+      # This function takes two arguments - the first is the holdings element to which it belongs, and the second is its position.
+      #   e.g., item_link(1,1) will return the first item under the first holdings link, item_link(2,2) will return the second item under the second holdings link.
+      function(:item_link)                          {|which_holdings = 1, which_item = 1| b.a(:xpath => "//div[@id='holdingsItemTree_tree']/ul[@class='jstree-no-icons']/li[#{which_holdings}]/ul/li[#{which_item}]/a")}
     end
 
     # Create a Line Object on an Editor page.

data/lib/olels/pages/bib_editor.rb

@@ -20,6 +20,7 @@ module OLE_QA::Framework::OLELS
     #   {OLE_QA::Framework::OLELS::Data_Line}
     def set_elements
       super
+      element(:message)                             {b.span(:id => "workMessageSection_span")}
       element(:leader_field)                        {b.text_field(:id => "LeaderTextInputField_control")}
       element(:bib_record_status_selector)          {b.select_list(:id => "StatusFieldSection_control")}
       element(:set_button)                          {b.button(:id => "set_button")}
@@ -32,13 +33,19 @@ module OLE_QA::Framework::OLELS
       element(:control_009_link)                    {b.a(:id => "009FieldLink")}
       # Control Fields & Related Elements
       #   (NB - Dependent on links & leader field state!)
+      # TODO - Update when OLE-4431 is resolved.  {https://jira.kuali.org/browse/OLE-4431}
+      element(:control_001_field)                   {b.text_field(:id => "Control_Field_001_control")}
       element(:control_003_field)                   {b.text_field(:id => "Control_Field_003_control")}
       element(:control_005_field)                   {b.text_field(:id => "Control_Field_005_control")}
-      element(:control_006_field)                   {b.text_field(:id => "Control_Field_006_control")}
+      element(:control_006_field)                   {b.text_field(:id => "006Field_control")}
       element(:control_006_format_selector)         {b.select_list(:id => "006Field_0_control")}
       element(:control_006_set_button)              {b.button(:id => "ControlField_Set_button")}
       element(:control_006_reset_button)            {b.button(:id => "ControlField_Reset_button")}
-      element(:control_008_field)                   {b.text_field(:id => "Control_Field_008_control")}
+      element(:control_007_field)                   {b.text_field(:id => "007Field_control")}
+      element(:control_007_catmtrl_selector)        {b.select_list(:id => "007Field_0_control")}
+      element(:control_007_set_button)              {b.button(:id => "ControlField007_Set_button")}
+      element(:control_007_reset_button)            {b.button(:id => "ControlField007_Reset_button")}
+      element(:control_008_field)                   {b.text_field(:id => "008Field_control")}
     end
 
     # Add the first Marc Data Line to a new Bib Editor record.

data/lib/olels/pages/instance_editor.rb

@@ -19,7 +19,7 @@ module OLE_QA::Framework::OLELS
     def set_elements
       super
       # Override :message element on Editor base class.
-      element(:message, force = true)                 {b.span(:id => "workInstanceMessage_span")}
+      element(:message)                               {b.span(:id => "workInstanceMessage_span")}
       element(:location_toggle)                       {b.a(:id => "OleLocationInformationSection_toggle")}
       element(:location_field)                        {b.text_field(:id => "OleHoldingLocation_control")}
       element(:call_number_toggle)                    {b.a(:id => "OleCallNumberInformation_toggle")}

data/lib/olels/pages/item_editor.rb

@@ -19,7 +19,7 @@ module OLE_QA::Framework::OLELS
     def set_elements
       super
       # Override message in Editor base class, add multi-message element.
-      element(:message, true)                             {b.span(:id => "workItemMessage_span")}
+      element(:message)                                   {b.span(:id => "workItemMessage_span")}
       element(:messages)                                  {b.span(:id => "workItemMessage_span").font}
       # Holdings Location/Call Number Information
       element(:holdings_location_field)                   {b.span(:id => "OleHoldingLocationLevelName_control")}

data/spec/olels/bib_editor_spec.rb

@@ -33,7 +33,8 @@ describe 'The Bib Editor' do
   end
 
   it 'should have bib editor elements' do
-    elements = @bib_editor.methods
+    elements = @bib_editor.elements
+    elements.include?(:message).should be_true
     elements.include?(:leader_field).should be_true
     elements.include?(:bib_record_status_selector).should be_true
     elements.include?(:set_button).should be_true
@@ -43,15 +44,21 @@ describe 'The Bib Editor' do
     elements.include?(:control_007_link).should be_true
     elements.include?(:control_008_link).should be_true
     elements.include?(:control_009_link).should be_true
+    elements.include?(:control_001_field).should be_true
     elements.include?(:control_003_field).should be_true
     elements.include?(:control_005_field).should be_true
     elements.include?(:control_006_field).should be_true
     elements.include?(:control_006_format_selector).should be_true
     elements.include?(:control_006_set_button).should be_true
     elements.include?(:control_006_reset_button).should be_true
+    elements.include?(:control_007_field).should be_true
+    elements.include?(:control_007_catmtrl_selector).should be_true
+    elements.include?(:control_007_set_button).should be_true
+    elements.include?(:control_007_reset_button).should be_true
     elements.include?(:control_008_field).should be_true
     elements.include?(:delete_bib_button).should be_true
-    elements.include?(:holdings_links).should be_true
+    elements.include?(:holdings_link).should be_true
+    elements.include?(:holdings_icon).should be_true
     elements.include?(:item_links).should be_true
     elements.include?(:add_instance_buttons).should be_true
     elements.include?(:delete_instance_buttons).should be_true

data/spec/olels/editor_spec.rb

@@ -47,7 +47,6 @@ describe 'The Editor base class' do
     elements.include?(:cancel_button).should be_true
     elements.include?(:close_button).should be_true
     elements.include?(:return_to_search_button).should be_true
-    elements.include?(:message).should be_true
   end
 
   it 'should wait for a title to be present' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ole-qa-framework
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - ole-qa-framework.gemspec
+- pkg/ole-qa-framework-2.1.1.gem
 - pkg/ole-qa-framework-2.1.0.gem
 - examples/purap_workflow_test.rb
 - examples/README.md
@@ -203,7 +204,9 @@ files:
 - lib/olefs/pages/payment_request.rb
 - lib/olefs/pages/building_lookup.rb
 - lib/ole-qa-framework.rb
+- lib/config/dev_options.yml
 - lib/config/default_options.yml
+- lib/config/defaults.yml
 - lib/ole_qa_framework/COMPATIBILITY.rb
 - lib/ole_qa_framework/VERSION.rb
 - lib/docstore/docstore.rb