ole-qa-framework 2.7.3 → 3.0.0

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### v3.0.0 - 2013/10/15
+
+* Flexible Line Objects
+    * Line Objects & Subline Objects are defined once on a parent object
+    * The line number instance variable is now settable.
+    * The line ID instance variable has been replaced with a reader lookup method.
+    * Array reader attributes are used to track lines & sublines on instantiated objects.
+        * A lines array has been implemented on all page objects.
+        * A sublines array has been implemented on all line objects.
+* OLELS
+    * Fix element definitions on Return Screen page.
+    * Fix element definitions on Staff Upload page.
+* Spec
+    * Remove old workflow spec, no longer accurate or necessary.
+
 ### v2.7.3 - 2013/10/11
 
 * Page (base class)

data/lib/common/common_object.rb

@@ -26,7 +26,7 @@ module OLE_QA::Framework
     # The OLE_QA::Framework::Session instance passed to the Data Object.
     attr_accessor :ole
 
-    # Arrays containing the names(Symbol) of each element or function declared
+    # Arrays containing the name (Symbol) of each element or function declared
     #   on a data object.
     attr_reader :elements, :functions
 

data/lib/common/line_object.rb

@@ -20,25 +20,50 @@ module OLE_QA::Framework
   class Line_Object < Data_Object
 
     # The line number that this object will have on the screen.
-    # - Used for line identifier replacement.
-    attr_reader :line_number
-    attr_reader :line_id
+    # - This is the 1-based line number used for replacement of human-readable identifiers.
+    attr_accessor :line_number
+
+    # An array containing the name (Symbol) of each subline element on the line object.
+    attr_reader :sublines
 
     # @param ole_session [Object] The OLE_QA::Framework::Session session to pass to the Data Object.
     # @param line_number [Fixnum] The number this line object will use for element definitions.
     def initialize(ole_session, line_number = 1)
       @line_number = line_number
-      @line_id = line_number - 1
       super(ole_session)
+      @sublines = Array.new
+      set_sublines if defined?(self.set_sublines)
     end
 
-    # Set element definitions, if any.
-    # @note Use @line_number or @line_id in an element definition to specify either the textual,
-    #   human-readable (1-based) line number of the line object, or the coded, application-readable
-    #   (0-based) line identifier number of the line object.
-    def set_elements
+    # A reader method for the line_id function.
+    # - This is the 0-based line number used for replacement of programmatic identifiers such as element IDs.
+    def line_id
+      @line_number - 1
     end
 
-
+    # Set a subline object definition on a page object.
+    # - A subline object created with this method becomes an accessor attribute
+    #   associated with an instance variable on the page or data object on
+    #   which it is created.
+    #
+    # @param name [Symbol] The name the new subline object will have on the object.
+    #   (This will be an instance variable, so it cannot contain spaces.)
+    # @param klas [Class] The class to instantiate for the new subline object.
+    #   (An error will be returned if the class given is not defined.)
+    # @param force [Boolean] If set to true, this method can be used to override an existing subline object definition.
+    #
+    # @raise StandardError if a parameter is of an incorrect type.
+    # @raise StandardError if an instance method already exists for a subline object with the same name.
+    #   (Suppress with force = true.)
+    #
+    def set_subline(name, klas, force = false)
+      raise StandardError, "Name must be a symbol.  Given:  #{name}  (#{name.class})" unless name.instance_of?(Symbol)
+      raise StandardError, "Klas must be a class.  Given:  #{klas}  (#{klas.class})"  unless klas.instance_of?(Class)
+      raise StandardError, "Subline object is already defined.  (Use the 'force = true' option to suppress this error.)" if @sublines.include?(name) && ! force
+      instance_variable_set("@#{name}", klas.new(@ole, 1))
+      make_reader(name) unless force
+      @sublines << name unless force
+    end
+    alias_method(:subline, :set_subline)
   end
 end

data/lib/common/page.rb

@@ -23,6 +23,9 @@ module OLE_QA::Framework
     #   or OLELS, instead use the :new_url accessor set on the e-Doc object.
     attr_reader :url
 
+    # An array containing the name (Symbol) of each line object on the page object.
+    attr_reader :lines
+
     include OLE_QA::Framework::Page_Helpers
 
     # @param ole_session [Object] The OLE_QA::Framework::Session instance in which the page should load.
@@ -31,7 +34,9 @@ module OLE_QA::Framework
       super(ole_session)
       @url = url
       @wait_on = Array.new
+      @lines = Array.new
       wait_for_elements if defined?(self.wait_for_elements)
+      set_lines if defined?(self.set_lines)
     end
 
     # Open the page via URL.

data/lib/common/subline_object.rb

@@ -14,34 +14,18 @@
 
 module OLE_QA::Framework
   # A Data Object in OLE that represents a line nested under another line.
-  # A subline can usually be added or deleted, and has element identifiers
-  # which vary dependent upon the line below which they are nested.
-  class Subline_Object < Data_Object
+  # - A subline object can be recursed under another subline object, use of the "@parent_line"
+  #   instance variable should allow for continued recursion ad nauseam.
+  class Subline_Object < Line_Object
 
-    # The line number that this object will have on the screen.
-    # - Used for line identifier replacement.
-    attr_reader :line_number
-    attr_reader :line_id
-
-    # The line number that this subline object will have on the screen.
-    # - Used for subline identifier replacement.
-    attr_reader :subline_number
-    attr_reader :subline_id
+    # The line under which this subline object was created.
+    attr_reader :parent_line
 
     # @param ole_session [Object] The OLE_QA::Framework::Session session to pass to the Data Object.
     # @param line_number [Fixnum] The line number this subline object will use for element definitions.
-    # @param subline_number [Fixnum] The subline number this subline object will use for element definitions.
-    def initialize(ole_session, line_number = 1, subline_number = 1)
-      @line_number, @subline_number = line_number, subline_number
-      @line_id = line_number -1
-      @subline_id = subline_number -1
-      super(ole_session)
-    end
-
-    # Set elements on the subline object.
-    # @note Use line_number, line_id, subline_number, and subline_id to replace dynamic identifier numbers.
-    #   (See {OLE_QA::Framework::Line_Object#set_elements} for more on line number substitution.)
-    def set_elements
+    def initialize(ole_session, parent_line, line_number = 1)
+      @parent_line = parent_line
+      super(ole_session, line_number)
     end
   end
 end

data/lib/module/qa_helpers.rb

@@ -126,7 +126,7 @@ module OLE_QA::Framework::Helpers
     eigenclass = class << self;
       self
     end
-    raise StandardError, "Element is already defined.  (Use the 'force = true' option to suppress this error.)" if eigenclass.instance_methods.include?(name) && ! force
+    raise StandardError, "Function is already defined.  (Use the 'force = true' option to suppress this error.)" if eigenclass.instance_methods.include?(name) && ! force
     eigenclass.class_eval do
       define_method name.to_s do |*arg|
         yield *arg

data/lib/module/qa_page_helpers.rb

@@ -14,4 +14,28 @@
 
 module OLE_QA::Framework::Page_Helpers
 
+  # Set a line object definition on a page object.
+  # - A line object created with this method becomes an accessor attribute
+  #   associated with an instance variable on the page or data object on
+  #   which it is created.
+  #
+  # @param name [Symbol] The name the new line object will have on the object.
+  #   (This will be an instance variable, so it cannot contain spaces.)
+  # @param klas [Class] The class to instantiate for the new line object.
+  #   (An error will be returned if the class given is not defined.)
+  # @param force [Boolean] If set to true, this method can be used to override an existing line object definition.
+  #
+  # @raise StandardError if a parameter is of an incorrect type.
+  # @raise StandardError if an instance method already exists for a line object with the same name.
+  #   (Suppress with force = true.)
+  #
+  def set_line(name, klas, force = false)
+    raise StandardError, "Name must be a symbol.  Given:  #{name}  (#{name.class})" unless name.instance_of?(Symbol)
+    raise StandardError, "Klas must be a class.  Given:  #{klas}  (#{klas.class})"  unless klas.instance_of?(Class)
+    raise StandardError, "Line object is already defined.  (Use the 'force = true' option to suppress this error.)" if @lines.include?(name) && ! force
+    instance_variable_set("@#{name}", klas.new(@ole, 1))
+    make_reader(name) unless force
+    @lines << name unless force
+  end
+  alias_method(:line, :set_line)
 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.7.3'
+    VERSION = '3.0.0'
   end
 end

data/lib/olefs/common/purap_document.rb

@@ -15,10 +15,6 @@
 module OLE_QA::Framework::OLEFS
   # An OLE Financial System PURchasing/Accounts Payable Document
   class PURAP_Document < E_Doc
-    def initialize(ole_session, url)
-      super(ole_session, url)
-      set_lines if defined?(self.set_lines)
-    end
 
     # Set PURAP Document Elements.
     def set_elements
@@ -47,27 +43,26 @@ module OLE_QA::Framework::OLEFS
       element(:vendor_tab_toggle)                                 {b.input(:id => "tab-Vendor-imageToggle")}
       element(:closed_vendor_name_field)                          {b.td(:xpath => "//tr/th[div[contains(text(),'Suggested Vendor:')]]/following-sibling::td[1]")}
       # Route Log Tab
-      element(:route_log_tab_toggle)              {b.input(:id => "tab-RouteLog-imageToggle")}
-      # element(:actions_taken)                     {b.bs(:xpath => "//div[@id='tab-ActionsTaken-div']/div[1]/table/tbody/tr/td[1]/b")}
-      # element(:actions_taken_by)                  {b.as(:xpath => "//div[@id='tab-ActionsTaken-div']/div[1]/table/tbody/tr/td[2]/a")}
-    end
-
-    # Create a Line Object on a PURAP Document page.
-    def create_line(instance_name, class_name, which=0)
-      raise StandardError, "Line object already exists.  (#{instance_name})" if self.instance_variables.include?("@#{instance_name}".to_sym)
-      new_line_name = instance_name
-      make_accessor(:"#{instance_name}")
-      klas = OLE_QA::Framework::OLEFS.const_get(:"#{class_name}")
-      instance_variable_set(:"@#{new_line_name}", klas.new(@ole, which))
-    end
-    alias_method(:add_line,:create_line)
-
-    # Remove a Line Object from a PURAP Document page.
-    def remove_line(instance_name)
-      raise StandardError, "Line object does not exist.  (#{instance_name})" unless self.instance_variables.include?("@#{instance_name}".to_sym)
-      remove_instance_variable("@#{instance_name}".to_sym)
-      unmake_attr(instance_name.to_sym)
+      element(:route_log_tab_toggle)                              {b.input(:id => "tab-RouteLog-imageToggle")}
+      # New Purchasing Line Item Elements
+      element(:new_bib_option)                                    {b.radio(:name => 'AttachBib', :index => 0)}
+      element(:existing_bib_option)                               {b.radio(:name => 'AttachBib', :index => 1)}
+      element(:existing_bib_button)                               {b.input(:id => 'bibSelectExistingItemButton')}
+      element(:new_bib_button)                                    {b.input(:id => "bibCreateCurrentItemButton")}
+      element(:item_type_selector)                                {b.select_list(:id => "newPurchasingItemLine.itemTypeDescription")}
+      element(:copies_field)                                      {b.text_field(:id => "newPurchasingItemLine.oleItemQuantity")}
+      element(:parts_field)                                       {b.text_field(:id => "newPurchasingItemLine.itemNoOfParts")}
+      element(:list_price_field)                                  {b.text_field(:id => "newPurchasingItemLine.itemListPrice")}
+      element(:public_view_checkbox)                              {b.checkbox(:id => "newPurchasingItemLine.itemPublicViewIndicator")}
+      element(:item_price_source_selector)                        {b.select_list(:id => "newPurchasingItemLine.itemPriceSourceId")}
+      element(:request_source_selector)                           {b.select_list(:id => "newPurchasingItemLine.requestSourceTypeId")}
+      element(:format_selector)                                   {b.select_list(:id => "newPurchasingItemLine.formatTypeId")}
+      element(:category_selector)                                 {b.select_list(:id => "newPurchasingItemLine.categoryId")}
+      element(:route_to_requestor_checkbox)                       {b.checkbox(:id => "newPurchasingItemLine.itemRouteToRequestorIndicator")}
+      element(:discount_field)                                    {b.text_field(:id => "newPurchasingItemLine.itemDiscount")}
+      element(:discount_type_selector)                            {b.select_list(:id => "newPurchasingItemLine.itemDiscountType")}
+      element(:add_button)                                        {b.input(:name => "methodToCall.addItem")}
+      element(:location_selector)                                 {b.select_list(:id => 'newPurchasingItemLine.itemLocation')}
     end
-    alias_method(:delete_line,:remove_line)
   end
 end

data/lib/olefs/objects/invoice_current_item.rb

@@ -14,7 +14,7 @@
 
 module OLE_QA::Framework::OLEFS
   # A Current Items line on an OLE Financial System Invoice e-document.
-  class Invoice_Current_Item < OLE_QA::Framework::OLEFS::Invoice_Line_Object
+  class Invoice_Current_Item < OLE_QA::Framework::Line_Object
 
     def set_elements
       super

data/lib/olefs/objects/invoice_line.rb

@@ -20,7 +20,7 @@ module OLE_QA::Framework::OLEFS
   #   of extra recursion to address the multiple sub-objects of an Invoice E-Document.
   # - The future structure of Invoice documents is presently uncertain, so this is a temporary measure.
   #   If necessary, the framework may be restructured to follow this model.
-  class Invoice_Line < OLE_QA::Framework::OLEFS::Invoice_Line_Object
+  class Invoice_Line < OLE_QA::Framework::Line_Object
 
     # A flexible PO line item object with dynamic ID element definitions on an Invoice document.
     attr_reader :line_item
@@ -28,7 +28,6 @@ module OLE_QA::Framework::OLEFS
     # Set OLE instance & line number, instantiate line item for PO line on Invoice document.
     def initialize(ole_session, line_number = 1)
       super(ole_session, line_number)
-      @line_item = OLE_QA::Framework::OLEFS::Invoice_Line_Item.new(@ole, self, 1)
     end
 
     # Set invoice line elements.
@@ -51,5 +50,9 @@ module OLE_QA::Framework::OLEFS
     def set_functions
       super
     end
+
+    def set_sublines
+      subline(:line_item, OLE_QA::Framework::OLEFS::Invoice_Line_Item)
+    end
   end
 end

data/lib/olefs/objects/line_item.rb

@@ -14,38 +14,38 @@
 
 module OLE_QA::Framework::OLEFS
   # A single Line Item in an OLE Financial System PURAP E-Document.
-  class Line_Item < OLE_QA::Framework::OLEFS::Line_Object
-    # Create accessor methods for new subline objects.
+  class Line_Item < OLE_QA::Framework::Line_Object
+    # Create accessor methods for subline objects.
     def set_sublines
-      create_subline("new_accounting_line","New_Accounting_Line")
-      create_subline("new_notes_line","New_Notes_Line")
-      create_subline("new_copies_line","New_Copies_Line")
+      set_subline(:accounting_line, OLE_QA::Framework::OLEFS::Accounting_Line)
+      set_subline(:notes_line, OLE_QA::Framework::OLEFS::Notes_Line)
+      set_subline(:copies_line, OLE_QA::Framework::OLEFS::Copies_Line)
     end
 
     # Set line item elements.
     def set_elements
       super
       # Fields
-      element(:copies_field)                      {b.text_field(:id => "document.item[#{@line_id}].oleItemQuantity")}
-      element(:parts_field)                       {b.text_field(:id => "document.item[#{@line_id}].itemNoOfParts")}
-      element(:list_price_field)                  {b.text_field(:id => "document.item[#{@line_id}].itemListPrice")}
-      element(:discount_field)                    {b.text_field(:id => "document.item[#{@line_id}].itemDiscount")}
+      element(:copies_field)                      {b.text_field(:id => "document.item[#{line_id}].oleItemQuantity")}
+      element(:parts_field)                       {b.text_field(:id => "document.item[#{line_id}].itemNoOfParts")}
+      element(:list_price_field)                  {b.text_field(:id => "document.item[#{line_id}].itemListPrice")}
+      element(:discount_field)                    {b.text_field(:id => "document.item[#{line_id}].itemDiscount")}
       element(:description_field)                 {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[1]/td[2]")}
       element(:item_type_field)                   {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[1]/td[3]")}
       element(:extended_cost_field)               {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[2]/td[3]")}
       element(:receipt_status_field)              {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[3]/td[1]")}
       # Selectors
-      element(:item_price_source_selector)        {b.select_list(:id => "document.item[#{@line_id}].itemPriceSourceId")}
-      element(:request_source_selector)           {b.select_list(:id => "document.item[#{@line_id}].requestSourceId")}
-      element(:item_type_selector)                {b.select_list(:id => "document.item[#{@line_id}].itemTypeDescription")}
-      element(:format_selector)                   {b.select_list(:id => "document.item[#{@line_id}].formatTypeId")}
-      element(:category_selector)                 {b.select_list(:id => "document.item[#{@line_id}].categoryId")}
-      element(:discount_type_selector)            {b.select_list(:id => "document.item[#{@line_id}].itemDiscountType")}
-      element(:location_selector)                 {b.select_list(:id => "document.item[#{@line_id}].itemLocation")}
+      element(:item_price_source_selector)        {b.select_list(:id => "document.item[#{line_id}].itemPriceSourceId")}
+      element(:request_source_selector)           {b.select_list(:id => "document.item[#{line_id}].requestSourceId")}
+      element(:item_type_selector)                {b.select_list(:id => "document.item[#{line_id}].itemTypeDescription")}
+      element(:format_selector)                   {b.select_list(:id => "document.item[#{line_id}].formatTypeId")}
+      element(:category_selector)                 {b.select_list(:id => "document.item[#{line_id}].categoryId")}
+      element(:discount_type_selector)            {b.select_list(:id => "document.item[#{line_id}].itemDiscountType")}
+      element(:location_selector)                 {b.select_list(:id => "document.item[#{line_id}].itemLocation")}
       # Buttons, Checkboxes, Etc.
       element(:delete_button)                     {b.input(:title => "Delete Item #{@line_number}")}
-      element(:route_to_requestor_checkbox)       {b.checkbox(:id => "document.item[#{@line_id}].itemRouteToRequestor")}
-      element(:public_view_checkbox)              {b.checkbox(:id => "document.item[#{@line_id}].itemPublicViewIndicator")}
+      element(:route_to_requestor_checkbox)       {b.checkbox(:id => "document.item[#{line_id}].itemRouteToRequestor")}
+      element(:public_view_checkbox)              {b.checkbox(:id => "document.item[#{line_id}].itemPublicViewIndicator")}
       # Readonly Elements
       # Use these for closed, uneditable fields as with a pre-existing line item on a purchase order.
       element(:closed_description_field)          {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[1]/td[2]")}
@@ -67,40 +67,34 @@ module OLE_QA::Framework::OLEFS
       element(:closed_unit_cost_field)            {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[5]/td[1]")}
       element(:closed_discount_field)             {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[5]/td[2]")}
       element(:closed_discount_type_field)        {b.td(:xpath => "//tr[td[@class='tab-subhead'][contains(text(),'Item #{@line_number}')]]/following-sibling::tr[5]/td[4]")}
-      # Subtab Toggle Buttons                   # Matches all of type, then selects by index = @line_id (i.e. if @line_num is 1, index is 0)
-      element(:accounting_lines_toggle)         {b.input(:id => /tab-AccountingLines[0-9]+-imageToggle/, :index => @line_id)}
+      # Subtab Toggle Buttons                   # Matches all of type, then selects by index = line_id (i.e. if @line_num is 1, index is 0)
+      element(:accounting_lines_toggle)           {b.input(:id => /tab-AccountingLines[0-9]+-imageToggle/, :index => line_id)}
+      # FIXME Re-define and re-enable these toggles
       #element(:notes_toggle)                   #TBD - The notes and copies lines are treated as the same line for ID purposes.
       #element(:copies_toggle)                  # There is no reliable way of knowing which index either should have without being state-aware.
+      # FIXME Move new_(X)_line elements to line item as their definitions are static in this context.
+      # New Accounting Line Elements
+      element(:account_number_field)              {b.text_field(:id => "document.item[#{line_id}].newSourceLine.accountNumber")}
+      element(:chart_selector)                    {b.select_list(:id => "document.item[#{line_id}].newSourceLine.chartOfAccountsCode")}
+      element(:sub_account_number_field)          {b.text_field(:id => "document.item[#{line_id}].newSourceLine.subAccountNumber")}
+      element(:object_field)                      {b.text_field(:id => "document.item[#{line_id}].newSourceLine.financialObjectCode")}
+      element(:sub_object_field)                  {b.text_field(:id => "document.item[#{line_id}].newSourceLine.financialSubObjectCode")}
+      element(:project_field)                     {b.text_field(:id => "document.item[#{line_id}].newSourceLine.projectCode")}
+      element(:org_ref_id_field)                  {b.text_field(:id => "document.item[#{line_id}].newSourceLine.organizationReferenceId")}
+      element(:dollar_field)                      {b.text_field(:id => "document.item[#{line_id}].newSourceLine.amount")}
+      element(:percent_field)                     {b.text_field(:id => "document.item[#{line_id}].newSourceLine.accountLinePercent")}
+      element(:add_account_button)                {b.input(:name => "methodToCall.insertSourceLine.line#{line_id}.anchoraccountingSourceAnchor")}
+      # New Notes Line Elements
+      element(:note_type_selector)                {b.select_list(:id => "document.item[#{line_id}].noteTypeId")}
+      element(:note_field)                        {b.text_field(:id => "document.item[#{line_id}].note")}
+      element(:add_note_button)                   {b.input(:name => "methodToCall.addNote.line#{line_id}")}
+      # New Copies Line Elements
+      # FIXME Update all definitions below
+      element(:num_copies_field)                  {b.text_field(:id => "document.item[#{line_id}].itemCopies")}
+      element(:num_parts_field)                   {b.text_field(:id => "")}
+      element(:location_copies_selector)          {b.select_list(:id => "document.item[#{line_id}].locationCopies")}
+      element(:starting_copy_field)               {b.text_field(:id => "document.item[#{line_id}].startingCopyNumber")}
+      element(:add_copy_button)                   {b.input(:name => "methodToCall.addCopy.line#{line_id}")}
     end
-
-    def create_accounting_line(which = 1)
-      create_subline("accounting_line_#{which}","Accounting_Line", which)
-    end
-    alias_method(:add_accounting_line,:create_accounting_line)
-
-    def create_notes_line(which = 1)
-      create_subline("notes_line_#{which}","Notes_Line", which)
-    end
-    alias_method(:add_notes_line,:create_notes_line)
-
-    def create_copies_line(which = 1)
-      create_subline("copies_line_#{which}","Copies_Line", which)
-    end
-    alias_method(:add_copies_line,:create_copies_line)
-
-    def remove_accounting_line(which = 1)
-      remove_subline("accounting_line_#{which}")
-    end
-    alias_method(:delete_accounting_line,:remove_accounting_line)
-
-    def remove_notes_line(which = 1)
-      remove_subline("notes_line_#{which}")
-    end
-    alias_method(:delete_notes_line,:remove_notes_line)
-
-    def remove_copies_line(which = 1)
-      remove_subline("copies_line_#{which}")
-    end
-    alias_method(:delete_copies_line,:remove_copies_line)
   end
 end

data/lib/olefs/objects/receiving_line.rb

@@ -14,12 +14,13 @@
 
 module OLE_QA::Framework::OLEFS
   # A single line on an OLE Financial System Receiving Document
-  class Receiving_Line < OLE_QA::Framework::OLEFS::Line_Object
+  class Receiving_Line < OLE_QA::Framework::Line_Object
     # Create accessor methods for new subline objects.
     def set_sublines
-      create_subline("new_exception_notes_line","New_Exception_Notes_Line")
-      create_subline("new_receipt_notes_line","New_Receipt_Notes_Line")
-      create_subline("new_copies_line","New_Copies_Line")
+      set_subline(:exception_notes_line, OLE_QA::Framework::OLEFS::Exception_Notes_Line)
+      set_subline(:receipt_notes_line, OLE_QA::Framework::OLEFS::Receipt_Notes_Line)
+      set_subline(:copies_line, OLE_QA::Framework::OLEFS::Copies_Line)
+      set_subline(:processing_line, OLE_QA::Framework::OLEFS::Processing_Line)
     end
 
     # Set receiving line elements.
@@ -32,57 +33,26 @@ module OLE_QA::Framework::OLEFS
       element(:prior_parts_received_field)                {b.td(:xpath => "//table[@summary='Items Section']/tbody/tr/td[1][b[contains(text(),'#{@line_number}')]]/following-sibling::td[7]")}
       element(:quantity_to_be_received_field)             {b.td(:xpath => "//table[@summary='Items Section']/tbody/tr/td[1][b[contains(text(),'#{@line_number}')]]/following-sibling::td[8]")}
       element(:parts_to_be_received_field)                {b.td(:xpath => "//table[@summary='Items Section']/tbody/tr/td[1][b[contains(text(),'#{@line_number}')]]/following-sibling::td[9]")}
-      element(:item_received_quantity_field)              {b.text_field(:id => "document.item[#{@line_id}].oleItemReceivedTotalQuantity")}
-      element(:item_received_parts_field)                 {b.text_field(:id => "document.item[#{@line_id}].oleItemReceivedTotalParts")}
-      element(:item_returned_quantity_field)              {b.text_field(:id => "document.item[#{@line_id}].oleItemReturnedTotalQuantity")}
-      element(:item_returned_parts_field)                 {b.text_field(:id => "document.item[#{@line_id}].oleItemReturnedTotalParts")}
-      element(:item_damaged_quantity_field)               {b.text_field(:id => "document.item[#{@line_id}].oleItemDamagedTotalQuantity")}
-      element(:item_damaged_parts_field)                  {b.text_field(:id => "document.item[#{@line_id}].oleItemDamagedTotalParts")}
-      element(:available_to_public_checkbox)              {b.checkbox(:id => "document.item[#{@line_id}].availableToPublic")}
-      element(:public_view_checkbox)                      {b.checkbox(:id => "document.item[#{@line_id}].availableToPublic")}
+      element(:item_received_quantity_field)              {b.text_field(:id => "document.item[#{line_id}].oleItemReceivedTotalQuantity")}
+      element(:item_received_parts_field)                 {b.text_field(:id => "document.item[#{line_id}].oleItemReceivedTotalParts")}
+      element(:item_returned_quantity_field)              {b.text_field(:id => "document.item[#{line_id}].oleItemReturnedTotalQuantity")}
+      element(:item_returned_parts_field)                 {b.text_field(:id => "document.item[#{line_id}].oleItemReturnedTotalParts")}
+      element(:item_damaged_quantity_field)               {b.text_field(:id => "document.item[#{line_id}].oleItemDamagedTotalQuantity")}
+      element(:item_damaged_parts_field)                  {b.text_field(:id => "document.item[#{line_id}].oleItemDamagedTotalParts")}
+      element(:available_to_public_checkbox)              {b.checkbox(:id => "document.item[#{line_id}].availableToPublic")}
+      element(:public_view_checkbox)                      {b.checkbox(:id => "document.item[#{line_id}].availableToPublic")}
       element(:exception_notes_toggle)                    {b.input(:xpath => "//tr[td/b[contains(text(),'#{@line_number}')]]/following-sibling::tr[2]/td[1]/table/tbody/tr[1]/th/div/input")}
       element(:receipt_notes_toggle)                      {b.input(:xpath => "//tr[td/b[contains(text(),'#{@line_number}')]]/following-sibling::tr[3]/td[1]/table/tbody/tr[1]/th/div/input")}
       element(:special_processing_instructions_toggle)    {b.input(:xpath => "//tr[td/b[contains(text(),'#{@line_number}')]]/following-sibling::tr[4]/td[1]/table/tbody/tr[1]/th/div/input")}
+      # FIXME add copies line toggle
+      # New Receipt Note Elements
+      element(:receipt_note_type_selector)                {b.select_list(:id => "document.item[#{line_id}].noteTypeId")}
+      element(:receipt_note_field)                        {b.text_field(:id => "document.item[#{line_id}].receiptNotes")}
+      element(:add_receipt_note_button)                   {b.input(:name => "methodToCall.addReceiptNote.line#{line_id}")}
+      # New Exception Note Elements
+      element(:exception_type_selector)                   {b.select_list(:id => "document.item[#{line_id}].exceptionTypeId")}
+      element(:exception_note_field)                      {b.text_field(:id => "document.item[#{line_id}].exceptionNotes")}
+      element(:add_exception_note_button)                 {b.input(:name => "methodToCall.addExceptionNOte.line#{line_id}")}
     end
-
-    def create_exception_notes_line(which = 1)
-      create_subline("exception_notes_line_#{which}","Exception_Notes_Line", which)
-    end
-    alias_method(:add_exception_notes_line,:create_exception_notes_line)
-
-    def create_receipt_notes_line(which = 1)
-      create_subline("receipt_notes_line_#{which}","Receipt_Notes_Line", which)
-    end
-    alias_method(:add_receipt_notes_line,:create_receipt_notes_line)
-
-    def create_copies_line(which = 1)
-      create_subline("copies_line_#{which}","Copies_Line", which)
-    end
-    alias_method(:add_copies_line,:create_copies_line)
-
-    def create_processing_line(which = 1)
-      create_subline("processing_line_#{which}","Processing_Line", which)
-    end
-    alias_method(:add_processing_line,:create_processing_line)
-
-    def remove_exception_notes_line(which = 1)
-      remove_subline("exception_notes_line_#{which}")
-    end
-    alias_method(:delete_exception_notes_line,:remove_exception_notes_line)
-
-    def remove_receipt_notes_line(which = 1)
-      remove_subline("receipt_notes_line_#{which}")
-    end
-    alias_method(:delete_receipt_notes_line,:remove_receipt_notes_line)
-
-    def remove_copies_line(which = 1)
-      remove_subline("copies_line_#{which}")
-    end
-    alias_method(:delete_copies_line,:remove_copies_line)
-
-    def remove_processing_line(which = 1)
-      remove_subline("processing_line_#{which}")
-    end
-    alias_method(:delete_processing_line,:remove_processing_line)
   end
 end