ole-qa-framework 2.7.3 → 3.0.0

data/lib/olefs/pages/invoice.rb

@@ -27,8 +27,6 @@ module OLE_QA::Framework::OLEFS
       url = ole_session.url + '/portal.do?channelTitle=Create&channelUrl='
       url += ole_session.url + '/ole-kr-krad/OLEInvoice?viewId=OLEInvoiceDocumentView&methodToCall=docHandler&command=initiate&documentClass=org.kuali.ole.krad.transaction.documents.OLEInvoiceDocument'
       super(ole_session, url)
-      @po_line = OLE_QA::Framework::OLEFS::Invoice_Line.new(@ole, 1)
-      @current_items_line = OLE_QA::Framework::OLEFS::Invoice_Current_Item.new(@ole, 1)
     end
 
     # Define basic invoice document screen elements.
@@ -85,5 +83,10 @@ module OLE_QA::Framework::OLEFS
       super
       function(:message)                              {|which = 1| b.ul(:id => 'pageValidationList').li(:index => which - 1)}
     end
+
+    def set_lines
+      set_line(:po_line, OLE_QA::Framework::OLEFS::Invoice_Line)
+      set_line(:current_items_line, OLE_QA::Framework::OLEFS::Invoice_Current_Item)
+    end
   end
 end

data/lib/olefs/pages/payment_request.rb

@@ -20,48 +20,9 @@ module OLE_QA::Framework::OLEFS
       super(ole_session, new_preq_url)
     end
 
-    # Create a new payment request line item on the payment request document.
-    def set_lines
-      create_line("new_line_item","New_PREQ_Line_Item")
-    end
-
     # Set Payment Request document screen elements.
     def set_elements
       super
-      # Invoice Info Tab
-      element(:invoice_number_field)                        {b.td(:xpath => "//h3[contains(text(),'Invoice Info')]/following-sibling::table/tbody/tr[1]/td[1]")}
-      element(:pay_date_field)                              {b.text_field(:id => "document.paymentRequestPayDate")}
-      element(:invoice_date_field)                          {b.td(:xpath => "//h3[contains(text(),'Invoice Info')]/following-sibling::table/tbody/tr[3]/td[1]")}
-      element(:immediate_pay_checkbox)                      {b.checkbox(:id => "document.immediatePaymentIndicator")}
-      element(:payment_attachment_checkbox)                 {b.checkbox(:id => "document.paymentAttachmentIndicator")}
-      element(:invoice_type_field)                          {b.text_field(:id => "document.oleInvoiceType.invoiceType")}
-      element(:invoice_subtype_field)                       {b.text_field(:id => "document.oleInvoiceSubType.invoiceSubType")}
-      element(:payment_method_selector)                     {b.select_list(:id => "document.paymentMethod.paymentMethodId")}
-      # Titles Tab
-      element(:grand_total_field)                           {b.b(:xpath => "//div[@id='tab-Titles-div']/descendant::th[div[contains(text(),'Grand Total')]]/following-sibling::td/div/b")}
-      element(:additional_charges_toggle)                   {b.input(:id => "tab-AdditionalCharges-imageToggle")}
-      element(:freight_extended_cost_field)                 {b.text_field(:id => "document.item[1].itemUnitPrice")}
-      element(:freight_description_field)                   {b.text_field(:id => "document.item[1].description")}
-      element(:shipping_handling_extended_cost_field)       {b.text_field(:id => "document.item[2].itemUnitPrice")}
-      element(:shipping_handling_description_field)         {b.text_field(:id => "document.item[2].description")}
-      element(:minimum_order_extended_cost_field)           {b.text_field(:id => "document.item[3].itemUnitPrice")}
-      element(:minimum_order_description_field)             {b.text_field(:id => "document.item[3].description")}
-      element(:misc_overhead_extended_cost_field)           {b.text_field(:id => "document.item[4].itemUnitPrice")}
-      element(:misc_overhead_description_field)             {b.text_field(:id => "document.item[4].description")}
-      element(:prorate_by_quantity_checkbox)                {b.checkbox(:id => "document.prorateQty")}
-      element(:prorate_by_dollar_checkbox)                  {b.checkbox(:id => "document.prorateDollar")}
-      element(:prorate_manual_checkbox)                     {b.checkbox(:id => "document.prorateManual")}
-      element(:close_po_checkbox)                           {b.checkbox(:id => "document.closePurchaseOrderIndicator")}
-    end
-
-    def create_line_item(which = 1)
-      create_line("line_item_#{which}","PREQ_Line_Item",which)
-    end
-    alias_method(:add_line_item,:create_line_item)
-
-    def remove_line_item(which = 1)
-      remove_line("line_item_#{which}")
     end
-    alias_method(:delete_line_item,:remove_line_item)
   end
 end

data/lib/olefs/pages/purchase_order.rb

@@ -25,7 +25,7 @@ module OLE_QA::Framework::OLEFS
 
     # Create a new line item object on the purchase order.
     def set_lines
-      create_line("new_line_item", "New_Line_Item")
+      set_line(:line_item, OLE_QA::Framework::OLEFS::Line_Item)
     end
 
     # Set Purchase Order screen elements.
@@ -54,15 +54,5 @@ module OLE_QA::Framework::OLEFS
       element(:receiving_button)                                  {b.input(:xpath => "//input[@title='Receiving']")}
       element(:print_button)                                      {b.input(:xpath => "//input[@title='Print']")}
     end
-
-    def create_line_item(which = 1)
-      create_line("line_item_#{which}","Line_Item", which)
-    end
-    alias_method(:add_line_item,:create_line_item)
-
-    def remove_line_item(which = 1)
-      remove_line("line_item_#{which}")
-    end
-    alias_method(:delete_line_item,:remove_line_item)
   end
 end

data/lib/olefs/pages/receiving_document.rb

@@ -22,7 +22,7 @@ module OLE_QA::Framework::OLEFS
 
     # Create a new receiving line object on the receiving document.
     def set_lines
-      create_line("new_receiving_line","New_Receiving_Line")
+      set_line(:receiving_line,OLE_QA::Framework::OLEFS::Receiving_Line)
     end
 
     # Set Receiving Doc screen elements.
@@ -35,15 +35,5 @@ module OLE_QA::Framework::OLEFS
       element(:reference_number_field)                            {b.text_field(:id => "document.shipmentReferenceNumber")}
       element(:carrier_selector)                                  {b.select_list(:id => "document.carrierCode")}
     end
-
-    def create_receiving_line(which = 1)
-      create_line("receiving_line_#{which}","Receiving_Line",which)
-    end
-    alias_method(:add_receiving_line,:create_receiving_line)
-
-    def remove_receiving_line(which = 1)
-      remove_line("receiving_line_#{which}")
-    end
-    alias_method(:delete_receiving_line,:remove_receiving_line)
   end
 end

data/lib/olefs/pages/requisition.rb

@@ -23,7 +23,7 @@ module OLE_QA::Framework::OLEFS
 
     # Create a new line item object on the requisition.
     def set_lines
-      create_line("new_line_item", "New_Line_Item")
+      set_line(:line_item, OLE_QA::Framework::OLEFS::Line_Item)
     end
 
     # Set Requisition screen elements.
@@ -49,15 +49,5 @@ module OLE_QA::Framework::OLEFS
       # Titles Tab
       element(:grand_total_field)                                 {b.b(:xpath => "//div[@id='tab-Titles-div']/descendant::th[div[contains(text(),'Grand Total')]]/following-sibling::td/div/b")}
     end
-
-    def create_line_item(which = 1)
-      create_line("line_item_#{which}","Line_Item", which)
-    end
-    alias_method(:add_line_item,:create_line_item)
-
-    def remove_line_item(which = 1)
-      remove_line("line_item_#{which}")
-    end
-    alias_method(:delete_line_item,:remove_line_item)
   end
 end

data/lib/olefs/subobjects/accounting_line.rb

@@ -19,27 +19,27 @@ module OLE_QA::Framework::OLEFS
     def set_elements
       super
       # Fields
-      element(:account_number_field)          {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].accountNumber")}
-      element(:sub_account_number_field)      {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].subAccountNumber")}
-      element(:object_field)                  {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].financialObjectCode")}
-      element(:sub_object_field)              {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].financialSubObjectCode")}
-      element(:project_field)                 {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].projectCode")}
-      element(:org_ref_id_field)              {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].organizationReferenceId")}
-      element(:dollar_field)                  {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].amount")}
-      element(:percent_field)                 {b.text_field(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].accountLinePercent")}
+      element(:account_number_field)          {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].accountNumber")}
+      element(:sub_account_number_field)      {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].subAccountNumber")}
+      element(:object_field)                  {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].financialObjectCode")}
+      element(:sub_object_field)              {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].financialSubObjectCode")}
+      element(:project_field)                 {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].projectCode")}
+      element(:org_ref_id_field)              {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].organizationReferenceId")}
+      element(:dollar_field)                  {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].amount")}
+      element(:percent_field)                 {b.text_field(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].accountLinePercent")}
       # Selectors
-      element(:chart_selector)                {b.select_list(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].chartOfAccountsCode")}
+      element(:chart_selector)                {b.select_list(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].chartOfAccountsCode")}
       # Inputs, Radio Buttons, & Checkboxes
-      element(:delete_button)                 {b.input(:name => "methodToCall.deleteSourceLine.line#{@line_id}.#{@subline_id}.anchoraccountingSourceAnchor")}
-      element(:balance_inquiry_button)        {b.input(:name => "methodToCall.performBalance(InquiryForSourceLine.line#{@line_id}:#{@subline_id}.anchoraccountingSourceExistingLineLineAnchor#{@subline_id}")}
+      element(:delete_button)                 {b.input(:name => "methodToCall.deleteSourceLine.line#{@parent_line.line_id}.#{line_id}.anchoraccountingSourceAnchor")}
+      element(:balance_inquiry_button)        {b.input(:name => "methodToCall.performBalance(InquiryForSourceLine.line#{@parent_line.line_id}:#{line_id}.anchoraccountingSourceExistingLineLineAnchor#{line_id}")}
       # Readonly Fields
       # Use the fields below when the target accounting line was added on an earlier PURAP document
       # (e.g., for accounting lines on a purchase order which were added on the requisition).
-      element(:closed_chart_field)            {b.div(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].chart.finChartOfAccountDescription.div").parent.a}
-      element(:closed_account_number_field)   {b.div(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].account.accountName.div").parent.a}
-      element(:closed_object_field)           {b.div(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].objectCode.financialObjectCodeName.div").parent.a}
-      element(:closed_dollar_field)           {b.div(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].amount.div")}
-      element(:closed_percent_field)          {b.div(:id => "document.item[#{@line_id}].sourceAccountingLine[#{@subline_id}].sourceAccountingLinePercent.div")}
+      element(:closed_chart_field)            {b.div(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].chart.finChartOfAccountDescription.div").parent.a}
+      element(:closed_account_number_field)   {b.div(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].account.accountName.div").parent.a}
+      element(:closed_object_field)           {b.div(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].objectCode.financialObjectCodeName.div").parent.a}
+      element(:closed_dollar_field)           {b.div(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].amount.div")}
+      element(:closed_percent_field)          {b.div(:id => "document.item[#{@parent_line.line_id}].sourceAccountingLine[#{line_id}].sourceAccountingLinePercent.div")}
     end
   end
 

data/lib/olefs/subobjects/copies_line.rb

@@ -18,15 +18,17 @@ module OLE_QA::Framework::OLEFS
     # Set copies line elements.
     def set_elements
       super
-      element(:location_copies_selector)        {b.select_list(:id => "document.item[#{@line_id}].copies[#{@subline_id}].location_copies")}
-      element(:delete_button)                   {b.input(:name => "methodToCall.deleteCopy.line#{@line_id}:#{@subline_id}")}
+      element(:location_copies_selector)        {b.select_list(:id => "document.item[#{@parent_line.line_id}].copies[#{line_id}].location_copies")}
+      element(:delete_button)                   {b.input(:name => "methodToCall.deleteCopy.line#{@parent_line.line_id}:#{line_id}")}
       # Readonly Elements
       # Use these for closed, uneditable fields as on a purchase order.
-      element(:closed_copies_field)             {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{@subline_num}')]]/following-sibling::tr[1]/td[1]/div")}
-      element(:closed_location_copies_field)    {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{@subline_num}')]]/following-sibling::tr[1]/td[2]/div")}
-      element(:closed_parts_field)              {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{@subline_num}')]]/following-sibling::tr[1]/td[3]/div")}
-      element(:closed_part_enumeration_field)   {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{@subline_num}')]]/following-sibling::tr[1]/td[4]/div")}
-      element(:closed_starting_copy_field)      {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{@subline_num}')]]/following-sibling::tr[1]/td[5]/div")}
+      # FIXME Add open fields to match the new copies line fields on OLEFS Line Item
+      # FIXME Redefine closed fields
+      element(:closed_copies_field)             {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{line_number}')]]/following-sibling::tr[1]/td[1]/div")}
+      element(:closed_location_copies_field)    {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{line_number}')]]/following-sibling::tr[1]/td[2]/div")}
+      element(:closed_parts_field)              {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{line_number}')]]/following-sibling::tr[1]/td[3]/div")}
+      element(:closed_part_enumeration_field)   {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{line_number}')]]/following-sibling::tr[1]/td[4]/div")}
+      element(:closed_starting_copy_field)      {b.div(:xpath => "//tr[td[@class='subhead'][contains(text(),'Copies #{line_number}')]]/following-sibling::tr[1]/td[5]/div")}
     end
   end
 end

data/lib/olefs/subobjects/exception_notes_line.rb

@@ -18,9 +18,9 @@ module OLE_QA::Framework::OLEFS
     # Set exception notes line elements.
     def set_elements
       super
-      element(:exception_type_selector)             {b.select_list(:id => "document.item[#{@line_id}].exceptionNoteList[#{@subline_id}].exceptionTypeId")}
-      element(:note_field)                          {b.text_field(:id => "document.item[#{@line_id}].exceptionNoteList[#{@subline_id}].exceptionNotes")}
-      element(:note_type_selector)                  {b.select_list(:id => "document.item[#{@line_id}].exceptionNoteList[#{@subline_id}].exceptionTypeId")}
+      element(:exception_type_selector)             {b.select_list(:id => "document.item[#{line_id}].exceptionNoteList[#{@subline_id}].exceptionTypeId")}
+      element(:note_field)                          {b.text_field(:id => "document.item[#{line_id}].exceptionNoteList[#{@subline_id}].exceptionNotes")}
+      element(:note_type_selector)                  {b.select_list(:id => "document.item[#{line_id}].exceptionNoteList[#{@subline_id}].exceptionTypeId")}
     end
   end
 end

data/lib/olefs/{objects → subobjects}/invoice_line_item.rb

@@ -14,59 +14,48 @@
 
 module OLE_QA::Framework::OLEFS
   # A single Line Item from a Purchase Order, as represented on an OLE Invoice E-Document.
-  class Invoice_Line_Item < OLE_QA::Framework::OLEFS::Invoice_Line_Object
-
-    # Allow the line number to be dynamically set, as needed for addressing various PO lines on an Invoice.
-    attr_accessor :line_number
-
-    # The instance of {OLE_QA::Framework::OLELS::PO_Line} which instantiated the Invoice Line Item object.
-    attr_reader :po_line
-
-    def initialize(ole_session, po_line, line_number = 1)
-      @po_line     = po_line
-      super(ole_session, line_number)
-    end
+  class Invoice_Line_Item < OLE_QA::Framework::Subline_Object
 
     def set_elements
       super
-      element(:number)                            {b.span(:id => "CurrentItem_LineItemNo_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:open_quantity)                     {b.span(:id => "CurrentItem_openQuantity_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:title)                             {b.div(:id => "CurrentItem_Title_line#{@po_line.line_id}_line#{line_id}")}
-      element(:copies_ordered)                    {b.div(:id => "CurrentItem_NoOfCopiesOrdered_line#{@po_line.line_id}_line#{line_id}")}
-      element(:parts_ordered)                     {b.div(:id => "CurrentItem_NoOfParts_line#{@po_line.line_id}_line#{line_id}")}
-      element(:copies_invoiced_field)             {b.text_field(:id => "CurrentItem_NoOfCopiesInvoice_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:parts_invoiced_field)              {b.text_field(:id => "CurrentItem_NoOfPartsInvoice_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:invoiced_price_field)              {b.text_field(:id => "CurrentItem_ListPrice_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:discount_field)                    {b.text_field(:id => "CurrentItem_Discount_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:discount_type_selector)            {b.select_list(:id => "CurrentItem_DiscountType_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:unit_cost)                         {b.span(:id => "CurrentItem_UnitCost_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:extended_cost)                     {b.span(:id => "CurrentItem_ExtendedCost_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:invoice_checkbox)                  {b.span(:id => "CurrentItem_ItemForInvoice_line#{@po_line.line_id}_line#{line_id}_control")}
-      element(:new_chart_selector)                {b.select_list(:id => "Invoice-chartOfAccountsCode_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_account_number_field)          {b.text_field(:id => "Invoice-accountNumber_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_subaccount_number_field)       {b.text_field(:id => "Invoice-subAccountNumber_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_object_code_field)             {b.text_field(:id => "Invoice-financialObjectCode_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_subobject_code_field)          {b.text_field(:id => "Invoice-financialSubObjectCode_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_project_field)                 {b.text_field(:id => "Invoice-projectCode_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_org_ref_id_field)              {b.text_field(:id => "InvoiceorgRefId_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_dollar_field)                  {b.text_field(:id => "Invoice-amount_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:new_percentage_field)              {b.text_field(:id => "Invoice-percent_line#{@po_line.line_id}_line#{line_id}_add_control")}
-      element(:add_account_button)                {b.button(:id => "OLEInvoiceView-processItems-accountingLines_line#{@po_line.line_id}_line#{line_id}_add")}
+      element(:number)                            {b.span(:id => "CurrentItem_LineItemNo_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:open_quantity)                     {b.span(:id => "CurrentItem_openQuantity_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:title)                             {b.div(:id => "CurrentItem_Title_line#{@parent_line.line_id}_line#{line_id}")}
+      element(:copies_ordered)                    {b.div(:id => "CurrentItem_NoOfCopiesOrdered_line#{@parent_line.line_id}_line#{line_id}")}
+      element(:parts_ordered)                     {b.div(:id => "CurrentItem_NoOfParts_line#{@parent_line.line_id}_line#{line_id}")}
+      element(:copies_invoiced_field)             {b.text_field(:id => "CurrentItem_NoOfCopiesInvoice_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:parts_invoiced_field)              {b.text_field(:id => "CurrentItem_NoOfPartsInvoice_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:invoiced_price_field)              {b.text_field(:id => "CurrentItem_ListPrice_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:discount_field)                    {b.text_field(:id => "CurrentItem_Discount_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:discount_type_selector)            {b.select_list(:id => "CurrentItem_DiscountType_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:unit_cost)                         {b.span(:id => "CurrentItem_UnitCost_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:extended_cost)                     {b.span(:id => "CurrentItem_ExtendedCost_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:invoice_checkbox)                  {b.span(:id => "CurrentItem_ItemForInvoice_line#{@parent_line.line_id}_line#{line_id}_control")}
+      element(:new_chart_selector)                {b.select_list(:id => "Invoice-chartOfAccountsCode_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_account_number_field)          {b.text_field(:id => "Invoice-accountNumber_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_subaccount_number_field)       {b.text_field(:id => "Invoice-subAccountNumber_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_object_code_field)             {b.text_field(:id => "Invoice-financialObjectCode_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_subobject_code_field)          {b.text_field(:id => "Invoice-financialSubObjectCode_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_project_field)                 {b.text_field(:id => "Invoice-projectCode_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_org_ref_id_field)              {b.text_field(:id => "InvoiceorgRefId_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_dollar_field)                  {b.text_field(:id => "Invoice-amount_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:new_percentage_field)              {b.text_field(:id => "Invoice-percent_line#{@parent_line.line_id}_line#{line_id}_add_control")}
+      element(:add_account_button)                {b.button(:id => "OLEInvoiceView-processItems-accountingLines_line#{@parent_line.line_id}_line#{line_id}_add")}
     end
 
     def set_functions
       super
       # Functions for accounting lines on an Invoice PO Line Item.
-      function(:chart_selector)                   { |which = 1| which -= 1; b.select_list(:id => "Invoice-chartOfAccountsCode_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:account_number_field)             { |which = 1| which -= 1; b.text_field(:id => "Invoice-accountNumber_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:subaccount_number_field)          { |which = 1| which -= 1; b.text_field(:id => "Invoice-subAccountNumber_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:object_code_field)                { |which = 1| which -= 1; b.text_field(:id => "Invoice-financialObjectCode_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:subobject_code_field)             { |which = 1| which -= 1; b.text_field(:id => "Invoice-financialSubObjectCode_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:project_field)                    { |which = 1| which -= 1; b.text_field(:id => "Invoice-projectCode_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:org_ref_id_field)                 { |which = 1| which -= 1; b.text_field(:id => "Invoice-orgRefId_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:dollar_field)                     { |which = 1| which -= 1; b.text_field(:id => "Invoice-amount_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:percentage_field)                 { |which = 1| which -= 1; b.text_field(:id => "Invoice-percent_line#{@po_line.line_id}_line#{line_id}_line#{which}_control")}
-      function(:delete_account_button)            { |which = 1| which -= 1; b.button(:id => "OLEInvoiceView-processItems-accountingLines_line#{@po_line.line_id}_line#{line_id}_del_line#{@po_line.line_id}_line#{line_id}_line#{which}")}
+      function(:chart_selector)                   { |which = 1| which -= 1; b.select_list(:id => "Invoice-chartOfAccountsCode_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:account_number_field)             { |which = 1| which -= 1; b.text_field(:id => "Invoice-accountNumber_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:subaccount_number_field)          { |which = 1| which -= 1; b.text_field(:id => "Invoice-subAccountNumber_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:object_code_field)                { |which = 1| which -= 1; b.text_field(:id => "Invoice-financialObjectCode_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:subobject_code_field)             { |which = 1| which -= 1; b.text_field(:id => "Invoice-financialSubObjectCode_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:project_field)                    { |which = 1| which -= 1; b.text_field(:id => "Invoice-projectCode_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:org_ref_id_field)                 { |which = 1| which -= 1; b.text_field(:id => "Invoice-orgRefId_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:dollar_field)                     { |which = 1| which -= 1; b.text_field(:id => "Invoice-amount_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:percentage_field)                 { |which = 1| which -= 1; b.text_field(:id => "Invoice-percent_line#{@parent_line.line_id}_line#{line_id}_line#{which}_control")}
+      function(:delete_account_button)            { |which = 1| which -= 1; b.button(:id => "OLEInvoiceView-processItems-accountingLines_line#{@parent_line.line_id}_line#{line_id}_del_line#{@parent_line.line_id}_line#{line_id}_line#{which}")}
     end
   end
 end

data/lib/olefs/subobjects/notes_line.rb

@@ -18,12 +18,12 @@ module OLE_QA::Framework::OLEFS
     # Set notes line elements.
     def set_elements
       super
-      element(:note_type_selector)            {b.select_list(:id => "document.item[#{@line_id}].notes[#{@subline_id}].noteTypeId")}
-      element(:note_field)                    {b.text_field(:id => "document.item[#{@line_id}].notes[#{@subline_id}].note")}
-      element(:delete_button)                 {b.input(:name => "methodToCall.deleteNote.line#{@line_id}:#{@subline_id}")}
+      element(:note_type_selector)            {b.select_list(:id => "document.item[#{@parent_line.line_id}].notes[#{line_id}].noteTypeId")}
+      element(:note_field)                    {b.text_field(:id => "document.item[#{@parent_line.line_id}].notes[#{line_id}].note")}
+      element(:delete_button)                 {b.input(:name => "methodToCall.deleteNote.line#{@parent_line.line_id}:#{line_id}")}
       # Use the elements below for a closed, inaccessible notes field on a PURAP document like a Purchase Order.
-      element(:closed_note_type_field)        {b.td(:xpath => "//tr[starts-with(@id,'tab-Notes')]/th/table[@class = 'datatable']/tbody[1]/tr[td[@class = 'subhead'][contains(text(),'Note #{@subline_num}')]]/following-sibling::tr[1]/td[1]")}
-      element(:closed_note_field)             {b.td(:xpath => "//tr[starts-with(@id,'tab-Notes')]/th/table[@class = 'datatable']/tbody[1]/tr[td[@class = 'subhead'][contains(text(),'Note #{@subline_num}')]]/following-sibling::tr[1]/td[2]")}
+      element(:closed_note_type_field)        {b.td(:xpath => "//tr[starts-with(@id,'tab-Notes')]/th/table[@class = 'datatable']/tbody[1]/tr[td[@class = 'subhead'][contains(text(),'Note #{@line_number}')]]/following-sibling::tr[1]/td[1]")}
+      element(:closed_note_field)             {b.td(:xpath => "//tr[starts-with(@id,'tab-Notes')]/th/table[@class = 'datatable']/tbody[1]/tr[td[@class = 'subhead'][contains(text(),'Note #{@line_number}')]]/following-sibling::tr[1]/td[2]")}
     end
   end
 end

data/lib/olefs/subobjects/processing_line.rb

@@ -17,8 +17,8 @@ module OLE_QA::Framework::OLEFS
   class Processing_Line < OLE_QA::Framework::Subline_Object
     def set_elements
       super
-      element(:note_field)                {b.td(:xpath => "//table[@summary='Items Section']/tbody/tr[td[1]/b[contains(text(),'#{@line_number}')]]/following-sibling::tr[4]/td[1]/table/tbody/tr[2]/td[1]/table/tbody/tr[td[contains(text(),'Note #{@subline_number}')]]/following-sibling::tr[1]/td[1]")}
-      element(:acknowledge_checkbox)      {b.checkbox(:xpath => "//table[@summary='Items Section']/tbody/tr[td[1]/b[contains(text(),'#{@line_number}')]]/following-sibling::tr[4]/td[1]/table/tbody/tr[2]/td[1]/table/tbody/tr[td[contains(text(),'Note #{@subline_number}')]]/following-sibling::tr[1]/td[2]")}
+      element(:note_field)                {b.td(:xpath => "//table[@summary='Items Section']/tbody/tr[td[1]/b[contains(text(),'#{@parent_line.line_number}')]]/following-sibling::tr[4]/td[1]/table/tbody/tr[2]/td[1]/table/tbody/tr[td[contains(text(),'Note #{@line_number}')]]/following-sibling::tr[1]/td[1]")}
+      element(:acknowledge_checkbox)      {b.checkbox(:xpath => "//table[@summary='Items Section']/tbody/tr[td[1]/b[contains(text(),'#{@parent_line.line_number}')]]/following-sibling::tr[4]/td[1]/table/tbody/tr[2]/td[1]/table/tbody/tr[td[contains(text(),'Note #{@line_number}')]]/following-sibling::tr[1]/td[2]")}
     end
   end
 end

data/lib/olefs/subobjects/receipt_notes_line.rb

@@ -18,8 +18,8 @@ module OLE_QA::Framework::OLEFS
     # Set receipt notes elements.
     def set_elements
       super
-      element(:note_type_selector)                    {b.select_list(:id => "document.item[#{@line_id}].receiptNoteList[#{@subline_id}].noteTypeId")}
-      element(:note_field)                            {b.text_field(:id => "document.item[#{@line_id}].receiptNoteList[#{@subline_id}].notes")}
+      element(:note_type_selector)                    {b.select_list(:id => "document.item[#{@parent_line.line_id}].receiptNoteList[#{line_id}].noteTypeId")}
+      element(:note_field)                            {b.text_field(:id => "document.item[#{@parent_line.line_id}].receiptNoteList[#{line_id}].notes")}
     end
   end
 end

data/lib/olels/common/e_doc.rb

@@ -28,23 +28,6 @@ module OLE_QA::Framework::OLELS
       element(:creation_timestamp)                    {b.span(:xpath => "//table[@class='uif-gridLayout']/descendant::th[span/label[contains(text(),'Creation Timestamp:')]]/following-sibling::td[1]/div/span")}
     end
 
-    # FIXME - Make this a single flexible method during namespace revision.
-    # Create a line object on a 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::OLELS.const_get(:"#{class_name}")
-      instance_variable_set(:"@#{new_line_name}", klas.new(@ole, which))
-    end
-
-    # Remove a line object from a 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)
-    end
-
     def wait_for_elements
       super
       @wait_on << :title

data/lib/olels/common/editor.rb

@@ -36,7 +36,6 @@ module OLE_QA::Framework::OLELS
       editor_url =  ole_session.url + 'portal.do?channelTitle=Editor&channelUrl='
       editor_url += ole_session.url + 'ole-kr-krad/editorcontroller?viewId=EditorView&methodToCall=load&docCategory=work&docType=bibliographic&docFormat=marc&editable=true'
       super(ole_session, editor_url)
-      set_lines if defined?(self.set_lines)
     end
 
     # Set elements common to all Editor screens.
@@ -82,21 +81,5 @@ module OLE_QA::Framework::OLELS
       #   - If .message_header is not present, a "0" will be returned.
       function(:message_count)                       { if message_header.present? then message_header.text.match(/\d(?=\smessage)/).to_s else "0" end}
     end
-
-    # Create a Line Object on an Editor 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::OLELS.const_get(:"#{class_name}")
-      instance_variable_set(:"@#{new_line_name}", klas.new(@ole, which))
-    end
-
-    # Remove a Line Object from an Editor 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)
-    end
   end
 end

data/lib/olels/objects/access_info_line.rb

@@ -14,12 +14,12 @@
 
 module OLE_QA::Framework::OLELS
   # An Access Information Line on the OLE Library System Instance Record Editor
-  class Access_Info_Line < OLE_QA::Framework::OLELS::Line_Object
+  class Access_Info_Line < OLE_QA::Framework::Line_Object
     # Set screen elements for access info line.
     def set_elements
-      element(:access_info_field)                     {b.text_field(:id => "OleAccessInformationField_line#{@line_id}_control")}
-      element(:add_button)                            {b.button(:id => "oleAccessInformation_addTagButton_line#{@line_id}")}
-      element(:remove_button)                         {b.button(:id => "oleAccessInformation_removeTagButton_line#{@line_id}")}
+      element(:access_info_field)                     {b.text_field(:id => "OleAccessInformationField_line#{line_id}_control")}
+      element(:add_button)                            {b.button(:id => "oleAccessInformation_addTagButton_line#{line_id}")}
+      element(:remove_button)                         {b.button(:id => "oleAccessInformation_removeTagButton_line#{line_id}")}
     end
   end
 end

data/lib/olels/objects/control_006_line.rb

@@ -15,15 +15,15 @@
 module OLE_QA::Framework::OLELS
 
   # Represents a Marc control field 006 line in the OLELS Bib Editor.
-  class Control_006_Line < OLE_QA::Framework::OLELS::Line_Object
+  class Control_006_Line < OLE_QA::Framework::Line_Object
 
     # Set Marc data line elements.
     def set_elements
-      element(:field)                       {b.text_field(:id => "Control_Field_006_line#{@line_id}_control")}
-      element(:add_button)                  {b.button(:id => "Control_Field_006_addTagButton_id_line#{@line_id}")}
-      element(:edit_button)                 {b.button(:id => "Control_Field_006_EditTagButton_id_line#{@line_id}")}
-      element(:remove_button)               {b.button(:id => "Control_Field_006_removeTagButton_id_line#{@line_id}")}
-      element(:clear_button)                {b.button(:id => "Control_Field_006_clearTagButton_id_line#{@line_id}")}
+      element(:field)                       {b.text_field(:id => "Control_Field_006_line#{line_id}_control")}
+      element(:add_button)                  {b.button(:id => "Control_Field_006_addTagButton_id_line#{line_id}")}
+      element(:edit_button)                 {b.button(:id => "Control_Field_006_EditTagButton_id_line#{line_id}")}
+      element(:remove_button)               {b.button(:id => "Control_Field_006_removeTagButton_id_line#{line_id}")}
+      element(:clear_button)                {b.button(:id => "Control_Field_006_clearTagButton_id_line#{line_id}")}
     end
   end
 end