sambal-cle 0.1.3 → 0.1.4

data/lib/sambal-cle/page_objects/assignments.rb

@@ -1,4 +1,3 @@
-
 #================
 # Assignments Pages
 #================
@@ -175,6 +174,8 @@ class AssignmentsList < AssignmentsBase
   listview_elements
   alias :add :add_assignment
 
+  expected_element :page_title
+
   # Returns an array of the displayed assignment titles.
   # Use for verification of test steps.
   def assignments_titles
@@ -183,7 +184,7 @@ class AssignmentsList < AssignmentsBase
     1.upto(a_table.rows.size-1) do |x|
       titles << a_table[x][1].h4(:index=>0).text
     end
-    return titles
+    titles
   end
   alias assignment_titles assignments_titles
   alias assignment_list assignments_titles
@@ -191,79 +192,52 @@ class AssignmentsList < AssignmentsBase
 
   # Clicks the Edit link for the assignment with the specified
   # id, then instantiates the AssignmentAdd page class.
-  def edit_assignment_id(id)
-    frm.link(:href=>/#{Regexp.escape(id)}/).click
-    AssignmentAdd.new(@browser)
-  end
+  page_method(:edit_assignment_id) { |id, b| b.frm.link(:href=>/#{Regexp.escape(id)}/).click }
 
   # Clicks the Edit link for the Assignment specified.
   # next is the AssignmentAdd page class.
-  def edit_assignment(assignment_name)
-    index = assignments_titles.index(assignment_name)
-    frm.link(:text=>"Edit", :index=>index).click
-  end
+  page_method(:edit_assignment) { |assignment_name, b|
+    index = b.assignments_titles.index(assignment_name)
+    b.frm.link(:text=>"Edit", :index=>index).click
+  }
 
   # Checks the appropriate checkbox, based on the specified assignment_name
   # Then clicks the Update button and confirms the deletion request.
-  # It then reinstantiates the AssignmentsList class because of the page
-  # update.
-  def delete_assignment(assignment_name)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(assignment_name)}/).checkbox(:name=>"selectedAssignments").set
-    frm.button(:value=>"Update").click
-    frm.button(:value=>"Delete").click
-    AssignmentsList.new(@browser)
-  end
+  page_method(:delete) { |assignment_name, b|
+    b.assignments_table.row(:text=>/#{Regexp.escape(assignment_name)}/).checkbox(:name=>"selectedAssignments").set
+    b.frm.button(:value=>"Update").click
+    b.frm.button(:value=>"Delete").click
+  }
 
   # Clicks on the Duplicate link for the Assignment specified.
   # Then instantiates the AssignmentsList page class.
-  def duplicate_assignment(assignment_name)
-    index = assignments_titles.index(assignment_name)
-    frm.link(:text=>"Duplicate", :index=>index).click
-    AssignmentsList.new(@browser)
-  end
+  page_method(:duplicate) { |assignment_name, b|
+    index = b.assignments_titles.index(assignment_name)
+    b.frm.link(:text=>"Duplicate", :index=>index).click
+  }
 
   # Gets the assignment id from the href of the specified
   # Assignment link.
-  def get_assignment_id(assignment_name)
-    assignment_href(assignment_name) =~ /(?<=\/a\/\S{36}\/).+(?=&pan)/
-    return $~.to_s
-  end
-
-  def assignment_href(name)
-    frm.link(:text=>/#{Regexp.escape(name)}/).href
-  end
+  page_method(:get_assignment_id) { |assignment_name, b| b.assignment_href(assignment_name) =~ /(?<=\/a\/\S{36}\/).+(?=&pan)/; $~.to_s }
+  page_method(:assignment_href) { |name, b| b.frm.link(:text=>/#{Regexp.escape(name)}/).href }
 
   # Checks the checkbox for the specified Assignment,
   # using the assignment id as the identifier.
-  def check_assignment(id) #FIXME to use name instead of id.
-    frm.checkbox(:value, /#{id}/).set
-  end
-
-  # Opens the specified assignment for viewing
-  def open_assignment(assignment_name)
-    frm.link(:text=>assignment_name).click
-  end
+  page_method(:check_assignment) { |id,b| b.frm.checkbox(:value, /#{id}/).set } #FIXME to use name instead of id.
+  page_method(:open_assignment) { |assignment_name, b| b.frm.link(:text=>assignment_name).click }
 
   # Gets the contents of the status column
   # for the specified assignment
-  def status_of(assignment_name)
-    frm.table(:class=>/listHier lines/).row(:text=>/#{Regexp.escape(assignment_name)}/).td(:headers=>"status").text
-  end
+  page_method(:status_of) { |assignment_name, b| b.assignments_table.row(:text=>/#{Regexp.escape(assignment_name)}/).td(:headers=>"status").text }
 
   # Clicks the View Submissions link for the specified
   # Assignment, then instantiates the AssignmentSubmissionList
   # page class.
-  def view_submissions_for(assignment_name)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(assignment_name)}/).link(:text=>"View Submissions").click
-    AssignmentSubmissionList.new(@browser)
-  end
+  page_method(:view_submissions_for) { |assignment_name, b| b.assignments_table.row(:text=>/#{Regexp.escape(assignment_name)}/).link(:text=>"View Submissions").click }
 
   # Clicks the Grade link for the specified Assignment,
   # then instantiates the AssignmentSubmissionList page class.
-  def grade(assignment_name)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(assignment_name)}/).link(:text=>"Grade").click
-    AssignmentSubmissionList.new(@browser)
-  end
+  page_method(:grade) { |assignment_name, b| b.assignments_table.row(:text=>/#{Regexp.escape(assignment_name)}/).link(:text=>"Grade").click }
 
   action(:sort_assignment_title) { |b| b.frm.link(:text=>"Assignment title").click }
   action(:sort_status) { |b| b.frm.link(:text=>"Status").click }
@@ -275,6 +249,9 @@ class AssignmentsList < AssignmentsBase
   element(:view) { |b| b.frm.select(:id=>"view") }
   action(:update) { |b| b.frm.button(:name=>"eventSubmit_doDelete_confirm_assignment").click }
 
+  element(:assignments_table) { |b| b.frm.table(:class=>"listHier lines nolines") }
+  element(:page_title) { |b| b.frm.div(:class=>"portletBody").h3(:text=>"Assignment List") }
+
 end
 
 # The Permissions Page in Assignments
@@ -284,47 +261,18 @@ class AssignmentsPermissions < AssignmentsBase
   # the AssignmentsList page class.
   action(:save) {|b| b.frm.button(:value=>"Save").click }
 
-  element(:evaluators_share_drafts) { |b| b.frm.checkbox(:id=>"Evaluatorasn.share.drafts") }
-  element(:organizers_share_drafts) { |b| b.frm.checkbox(:id=>"Organizerasn.share.drafts") }
-
-  element(:guests_all_groups) { |b| b.frm.checkbox(:id=>"Guestasn.all.groups") }
-  element(:guests_create_assignments) { |b| b.frm.checkbox(:id=>"Guestasn.new") }
-  element(:guests_submit_to_assigments) { |b| b.frm.checkbox(:id=>"Guestasn.submit") }
-  element(:guests_delete_assignments) { |b| b.frm.checkbox(:id=>"Guestasn.delete") }
-  element(:guests_read_assignments) { |b| b.frm.checkbox(:id=>"Guestasn.read") }
-  element(:guests_revise_assignments) { |b| b.frm.checkbox(:id=>"Guestasn.revise") }
-  element(:guests_grade_assignments) { |b| b.frm.checkbox(:id=>"Guestasn.grade") }
-  element(:guests_receive_notifications) { |b| b.frm.checkbox(:id=>"Guestasn.receive.notifications") }
-  element(:guests_share_drafts) { |b| b.frm.checkbox(:id=>"Guestasn.share.drafts") }
-  element(:instructors_all_groups) { |b| b.frm.checkbox(:id=>"Instructorasn.all.groups") }
-  element(:instructors_create_assignments) { |b| b.frm.checkbox(:id=>"Instructorasn.new") }
-  element(:instructors_submit_to_assigments) { |b| b.frm.checkbox(:id=>"Instructorasn.submit") }
-  element(:instructors_delete_assignments) { |b| b.frm.checkbox(:id=>"Instructorasn.delete") }
-  element(:instructors_read_assignments) { |b| b.frm.checkbox(:id=>"Instructorasn.read") }
-  element(:instructors_revise_assignments) { |b| b.frm.checkbox(:id=>"Instructorasn.revise") }
-  element(:instructors_grade_assignments) { |b| b.frm.checkbox(:id=>"Instructorasn.grade") }
-  element(:instructors_receive_notifications) { |b| b.frm.checkbox(:id=>"Instructorasn.receive.notifications") }
-  element(:instructors_share_drafts) { |b| b.frm.checkbox(:id=>"Instructorasn.share.drafts") }
-  element(:students_all_groups) { |b| b.frm.checkbox(:id=>"Studentasn.all.groups") }
-  element(:students_create_assignments) { |b| b.frm.checkbox(:id=>"Studentasn.new") }
-  element(:students_submit_to_assigments) { |b| b.frm.checkbox(:id=>"Studentasn.submit") }
-  element(:students_delete_assignments) { |b| b.frm.checkbox(:id=>"Studentasn.delete") }
-  element(:students_read_assignments) { |b| b.frm.checkbox(:id=>"Studentasn.read") }
-  element(:students_revise_assignments) { |b| b.frm.checkbox(:id=>"Studentasn.revise") }
-  element(:students_grade_assignments) { |b| b.frm.checkbox(:id=>"Studentasn.grade") }
-  element(:students_receive_notifications) { |b| b.frm.checkbox(:id=>"Studentasn.receive.notifications") }
-  element(:students_share_drafts) { |b| b.frm.checkbox(:id=>"Studentasn.share.drafts") }
-  element(:tas_all_groups) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.all.groups") }
-  element(:tas_create_assignments) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.new") }
-  element(:tas_submit_to_assigments) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.submit") }
-  element(:tas_delete_assignments) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.delete") }
-  element(:tas_read_assignments) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.read") }
-  element(:tas_revise_assignments) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.revise") }
-  element(:tas_grade_assignments) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.grade") }
-  element(:tas_receive_notifications) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.receive.notifications") }
-  element(:tas_share_drafts) { |b| b.frm.checkbox(:id=>"Teaching Assistantasn.share.drafts") }
+  def self.chekbocks(*method_names)
+    method_names.each do |method_name|
+      define_method method_name do |role|
+        self.frm.checkbox(:id=>"#{role}asn.#{method_name.to_s.gsub("_", ".")}")
+      end
+    end
+  end
+
+  chekbocks :all_groups, :new, :submit, :delete, :read, :revise, :grade, :receive_notifications, :share_drafts
+
   action(:undo_changes) { |b| b.frm.link(:text=>"Undo changes").click }
-  action(:cancel) { |b| b.frm.button(:id=>"eventSubmit_doCancel").click }
+  action(:cancel) { |b| b.frm.button(:name=>"eventSubmit_doCancel").click }
   action(:permission) { |b| b.frm.link(:text=>"Permission").click }
   action(:guest) { |b| b.frm.link(:text=>"Guest").click }
   action(:instructor) { |b| b.frm.link(:text=>"Instructor").click }
@@ -343,54 +291,36 @@ class AssignmentsPermissions < AssignmentsBase
 end
 
 # Page that appears when you click to preview an Assignment
+# as an instructor user. Note that the primary difference
+# between this class and AssignmentsView is that there are
+# instructor-specific buttons and menu options that don't
+# appear for student users.
 class AssignmentsPreview < AssignmentsBase
 
   menu_elements
-
-  # Returns the text content of the page header
-  def header
-    frm.div(:class=>"portletBody").h3.text
-  end
-
-  # Returns a hash object containing the contents of the Item Summary table.
-  # The hash's Key is the header column and the value is the content column.
-  def item_summary
-    hash = {}
-    frm.table(:class=>"itemSummary").rows.each do |row|
-      hash.store(row.th.text, row.td.text)
+  basic_page_elements # Needed for the header method
+
+  # returns a hash containing the info in the Summary table.
+  # Header fields are the keys and their associated tds are the values.
+  def summary_info
+    hash={}
+    array = frm.table(:class=>"itemSummary").to_a
+    array.each do |subarray|
+      hash.store(subarray[0], subarray[1])
     end
-    return hash
+    hash
   end
 
   # Grabs the Assignment Instructions text.
-  def assignment_instructions
-    frm.div(:class=>"textPanel").text
-  end
+  value(:instructions) { |b| b.frm.div(:class=>"textPanel").text }
 
   # Grabs the instructor comments text.
-  def instructor_comments
-    frm.div(:class=>"portletBody").div(:class=>"textPanel", :index=>2).text
-  end
-
-  #
-  def back_to_list
-    frm.button(:value=>"Back to list").click
-    AssignmentsList.new(@browser)
-  end
+  value(:instructor_comments) { |b| b.frm.div(:class=>"portletBody").div(:class=>"textPanel", :index=>2).text }
 
-  # Clicks the Post button, then instantiates
-  # the AssignmentsList page class.
-  def post
-    frm.button(:name=>"post").click
-    AssignmentsList.new(@browser)
-  end
+  action(:back_to_list) { |b| b.frm.button(:value=>"Back to list").click }
 
-  # Clicks the Cancel button and instantiates the
-  # AssignmentsList Class.
-  def cancel
-    frm.button(:value=>"Cancel").click
-    AssignmentsList.new(@browser)
-  end
+  # Clicks the Post button.
+  action(:post) { |b| b.frm.button(:name=>"post").click }
 
   element(:assignment_id) { |b| b.frm.hidden(:name=>"assignmentId") }
   action(:hide_assignment) { |b| b.frm.link(:href=>/doHide_preview_assignment_assignment/).click }
@@ -407,21 +337,9 @@ end
 class AssignmentsReorder < AssignmentsBase
 
   menu_elements
+  basic_page_elements
 
-  # Clicks the Save button, then instantiates
-  # the AssignmentsList page class.
-  def save
-    frm.button(:value=>"Save").click
-    AssignmentsList.new(@browser)
-  end
-
-  # Clicks the Cancel button, then instantiates
-  # the AssignmentsList Class.
-  def cancel
-    frm.button(:value=>"Cancel").click
-    AssignmentsList.new(@browser)
-  end
-
+  action(:save) { |b| b.frm.button(:value=>"Save").click }
   action(:sort_by_title) { |b| b.frm.link(:text=>"Sort by title").click }
   action(:sort_by_open_date) { |b| b.frm.link(:text=>"Sort by open date").click }
   action(:sort_by_due_date) { |b| b.frm.link(:text=>"Sort by due date").click }
@@ -431,169 +349,65 @@ class AssignmentsReorder < AssignmentsBase
 end
 
 # A Student user's page for editing/submitting/view an assignment.
-class AssignmentStudent < BasePage
+class AssignmentStudentView < BasePage
 
+  include FCKEditor
   frame_element
+  basic_page_elements
 
-  # Returns the text content of the page header
-  def header
-    frm.div(:class=>"portletBody").h3.text
-  end
-
-  # Returns a hash object containing the contents of the Item Summary table.
-  # The hash's Key is the header column and the value is the content column.
-  def item_summary
-    hash = {}
-    frm.table(:class=>"itemSummary").rows.each do |row|
-      hash.store(row.th.text, row.td.text)
+  def summary_info
+    hash={}
+    array = frm.table(:class=>"itemSummary").to_a
+    array.each do |subarray|
+      hash.store(subarray[0], subarray[1])
     end
-    return hash
+    hash
   end
 
-  # Grabs the instructor comments text.
-  def instructor_comments
-    frm.div(:class=>"portletBody").div(:class=>"textPanel", :index=>2).text
-  end
+  element(:editor) { |b| b.frm.frame(:id, "Assignment.view_submission_text___Frame") }
 
   # Enters the specified text into the Assignment Text FCKEditor.
   def assignment_text=(text)
-    frm.frame(:id, "Assignment.view_submission_text___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
+    remove_assignment_text
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
   # Clears out any existing text from the Assignment Text FCKEditor.
   def remove_assignment_text
-    frm.frame(:id, "Assignment.view_submission_text___Frame").div(:title=>"Select All").fire_event("onclick")
-    frm.frame(:id, "Assignment.view_submission_text___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys :backspace
+    select_all(editor)
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys :backspace
   end
 
-  # This class variable allows adding an arbitrary number of
-  # files to the page, as long as the adding steps alternate between
-  # selecting the file and clicking the add more files button
-  @@file_number = 0
-
-  # Enters the specified file name into the file field. Entering the path
-  # separately is optional.
-  # Once the filename is entered in the field, the
-  # @@file_number class variable is increased by one
-  # in case any more files need to be added to the upload
-  # list.
   def select_file(file_name, file_path="")
-    frm.file_field(:id=>"clonableUpload", :name=>"upload#{@@file_number}").set(file_path + file_name)
-    @@file_number += 1
-  end
-
-  # Clicks the Submit button, then instantiates
-  # the appropriate page class, based on the
-  # page that gets loaded.
-  def submit
-    frm.button(:value=>"Submit").click
-    @@file_number=0
-    if frm.div(:class=>"portletBody").h3.text=~/Submission Confirmation/
-      SubmissionConfirmation.new(@browser)
-    elsif frm.button(:value=>"Back to list").exist?
-      SubmissionConfirmation.new(@browser)
-    else
-      AssessmentsList.new(@browser)
-    end
-  end
-
-  # Clicks the Resubmit button, then instantiates
-  # the appropriate page class, based on the
-  # page that gets loaded.
-  #
-  # Resets @@file_number to zero so that file
-  # uploads will work if this page is visited again
-  # in the same script.
-  def resubmit
-    frm.button(:value=>"Resubmit").click
-    @@file_number=0
-    if frm.link(:text=>"Assignment title").exist?
-      puts "list..."
-      AssessmentsList.new(@browser)
-    else
-      SubmissionConfirmation.new(@browser)
-    end
-  end
-
-  # Clicks the Preview button, then
-  # instantiates the AssignmentStudentPreview page class.
-  #
-  # Resets @@file_number to zero so that file
-  # uploads will work if this page is visited again
-  # in the same script.
-  def preview
-    frm.button(:value=>"Preview").click
-    @@file_number=0
-    AssignmentStudentPreview.new(@browser)
-  end
-
-  # Clicks the Save Draft button, then
-  # instantiates the SubmissionConfirmation
-  # page class.
-  def save_draft
-    frm.button(:value=>"Save Draft").click
-    SubmissionConfirmation.new(@browser)
-  end
-
-  # Clicks the link to select more files
-  # from the Workspace. Then instantiates
-  # the AssignmentAttachments page class.
-  def select_more_files_from_workspace
-    frm.link(:id=>"attach").click
-    AssignmentAttachments.new(@browser)
-  end
-
-  # Clicks the Back to list button, then
-  # instantiates the AssignmentList page class.
-  def back_to_list
-    frm.button(:value=>"Back to list").click
-    AssignmentsList.new(@browser)
-  end
-
-  # Clicks the Cancel button and instantiates the
-  # AssignmentsList Class.
-  def cancel
-    frm.button(:value=>"Cancel").click
-    AssignmentsList.new(@browser)
+    frm.file_field(:id=>"clonableUpload", :name=>/upload/).set(file_path + file_name)
   end
 
+  action(:select_more_files_from_workspace) { |b| b.frm.link(:id=>"attach").click }
   action(:add_another_file) { |b| b.frm.link(:id=>"addMoreAttachmentControls") }
 
-end
-
-# Page that appears when a Student User clicks to Preview an
-# assignment that is in progress.
-class AssignmentStudentPreview < BasePage
+  element(:submit_button) { |b| b.frm.button(:value=>"Submit") }
+  element(:resubmit_button) { |b| b.frm.button(:value=>"Resubmit") }
+  element(:save_draft_button) { |b| b.frm.button(:value=>"Save Draft") }
+  element(:preview_button) { |b| b.frm.button(:value=>"Preview") }
 
-  frame_element
+  action(:submit) { |p| p.submit_button.click }
+  action(:resubmit) { |p| p.resubmit_button.click }
+  action(:save_draft) { |p| p.save_draft_button.click }
+  action(:back_to_list) { |b| b.frm.button(:value=>"Back to list").click }
+  action(:preview) { |p| p.preview_button.click }
 
-  # Clicks the Submit button, then
-  # instantiates the SubmissionConfirmation
-  # page class.
-  def submit
-    frm.button(:value=>"Submit").click
-    SubmissionConfirmation.new(@browser)
-  end
+  element(:instructor_comment_field) { |b| b.frm.form(:name=>"addSubmissionForm").div(:class=>"textPanel", :index=>1) }
 
-  # Clicks the Save Draft button, then
-  # instantiates the SubmissionConfirmation
-  # page class.
-  def save_draft
-    frm.button(:value=>"Save Draft").click
-    SubmissionConfirmation.new(@browser)
-  end
-
-  # Returns the contents of the submission box.
-  def submission_text
-    frm.div(:class=>"portletBody").div(:class=>/textPanel/).text
-  end
+  value(:instructions) { |b| b.frm.div(:class=>"portletBody").div(:class=>"textPanel").text }
+  value(:submission_text) { |b| b.frm.form(:name=>"addSubmissionForm").div(:class=>"textPanel").text }
+  value(:instructor_comments) { |p| p.instructor_comment_field.text }
 
   # Returns an array of strings. Each element in the
   # array is the name of attached files.
   def attachments
     names = []
     frm.ul(:class=>"attachList indnt1").links.each { |link| names << link.text }
-    return names
+    names
   end
 
 end
@@ -605,22 +419,24 @@ class SubmissionConfirmation < BasePage
   frame_element
 
   # Returns the text of the success message on the page.
-  def confirmation_text
-    frm.div(:class=>"portletBody").div(:class=>"success").text
-  end
+  value(:confirmation_text) { |b| b.frm.div(:class=>"portletBody").div(:class=>"success").text }
 
   # Returns the text of the assignment submission.
-  def submission_text
-    frm.div(:class=>"portletBody").div(:class=>"textPanel indnt2").text
-  end
+  value(:submission_text) { |b| b.frm.div(:class=>"portletBody").div(:class=>"textPanel indnt2").text }
 
   # Clicks the Back to list button, then
   # instantiates the AssignmentsList page class.
-  def back_to_list
-    frm.button(:value=>"Back to list").click
-    frm.link(:text=>"Assignment title").wait_until_present
-    AssignmentsList.new(@browser)
+  action(:back_to_list) { |b| b.frm.button(:value=>"Back to list").click }
+
+  def summary_info
+    hash={}
+    array = frm.table(:class=>"itemSummary").to_a
+    array.each do |subarray|
+      hash.store(subarray[0], subarray[1])
+    end
+    hash
   end
+
 end
 
 # The page that appears when you click on an assignment's "Grade" or "View Submission" link
@@ -631,33 +447,18 @@ class AssignmentSubmissionList < AssignmentsBase
   menu_elements
   listview_elements
 
-  # Clicks the Assignment List link and instantiates the AssignmentsList Class.
-  def assignment_list
-    frm.link(:text=>"Assignment List").click
-    AssignmentsList.new(@browser)
-  end
   # Clicks the Show Resubmission Settings button
-  def show_resubmission_settings
-    frm.image(:src, "/library/image/sakai/expand.gif?panel=Main").click
-  end
+  action(:show_resubmission_settings) { |b| b.frm.image(:src, "/library/image/sakai/expand.gif?panel=Main").click }
 
   # Clicks the Show Assignment Details button.
-  def show_assignment_details
-    frm.image(:src, "/library/image/sakai/expand.gif").click
-  end
+  action(:show_assignment_details) { |b| b.frm.image(:src, "/library/image/sakai/expand.gif").click }
 
   # Gets the Student table text and returns it in an Array object.
-  def student_table
-    table = frm.table(:class=>"listHier lines nolines").to_a
-  end
+  value(:student_table) { |b| b.frm.table(:class=>"listHier lines nolines").to_a }
 
   # Clicks the Grade link for the specified student, then
   # instantiates the AssignmentSubmission page class.
-  def grade(student_name)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(student_name)}/).link(:text=>"Grade").click
-    frm.frame(:id, "grade_submission_feedback_comment___Frame").td(:id, "xEditingArea").frame(:index=>0).wait_until_present
-    AssignmentSubmission.new(@browser)
-  end
+  pgmd(:grade) { |student_name, b| b.frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(student_name)}/).link(:text=>"Grade").click }
 
   # Gets the value of the status field for the specified
   # Student. Note that the student's name needs to be entered
@@ -666,9 +467,7 @@ class AssignmentSubmissionList < AssignmentsBase
   # students with the same name.
   #
   # Useful for verification purposes.
-  def submission_status_of(student_name)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(student_name)}/)[4].text
-  end
+  pgmd(:submission_status_of) { |student_name, b| b.frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(student_name)}/)[4].text }
 
   element(:search_input) { |b| b.frm.text_field(:id=>"search") }
   action(:find) { |b| b.frm.button(:value=>"Find").click }
@@ -701,40 +500,35 @@ class AssignmentSubmission < BasePage
   include FCKEditor
   frame_element
 
-  expected_element :editor
+  expected_element :assignment_submission
 
-  element(:editor) { |b| b.frm.frame(:id, "grade_submission_feedback_text___Frame") }
+  element(:assignment_submission) { |b| b.frm.frame(:id, "grade_submission_feedback_text___Frame") }
+  element(:instructor_comments) { |b| b.frm.frame(:id, "grade_submission_feedback_comment___Frame") }
 
   # Enters the specified text string in the FCKEditor box for the assignment text.
   def assignment_text=(text)
-    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
+    assignment_submission.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
   # Removes all the contents of the FCKEditor Assignment Text box.
   def remove_assignment_text
-    editor.div(:title=>"Select All").fire_event("onclick")
-    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys :backspace
+    assignment_submission.div(:title=>"Select All").fire_event("onclick")
+    assignment_submission.td(:id, "xEditingArea").frame(:index=>0).send_keys :backspace
   end
 
   # Enters the specified string into the Instructor Comments FCKEditor box.
   def instructor_comments=(text)
-    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
+    instructor_comments.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
   # Clicks the Add Attachments button, then instantiates the AssignmentAttachments Class.
-  def add_attachments
-    frm.button(:name=>"attach").click
-    AssignmentAttachments.new(@browser)
-  end
+  action(:add_attachments) { |b| b.frm.button(:name=>"attach").click }
 
   # Clicks the Return to List button, then instantiates the
   # AssignmentSubmissionList Class.
-  def return_to_list
-    frm.button(:value=>"Return to List").click
-    AssignmentSubmissionList.new(@browser)
-  end
+  action(:return_to_list) { |b| b.frm.button(:value=>"Return to List").click }
 
-  element(:select_default_grade) { |b| b.frm.select(:name=>"grade_submission_grade") }
+  element(:grade) { |b| b.frm.select(:name=>"grade_submission_grade") }
   element(:allow_resubmission) { |b| b.frm.checkbox(:id=>"allowResToggle") }
   element(:num_resubmissions) { |b| b.frm.select(:id=>"allowResubmitNumberSelect") }
   element(:accept_until_month) { |b| b.frm.select(:id=>"allow_resubmit_closeMonth") }
@@ -753,18 +547,4 @@ class GradeReport < BasePage
 
   frame_element
 
-end
-
-# The Student View page accessed from the Assignments page
-class StudentView < AssignmentsBase
-
-  menu_elements
-  listview_elements
-
-  action(:sort_assignment_title) { |b| b.frm.link(:text=>"Assignment title").click }
-  action(:sort_status) { |b| b.frm.link(:text=>"Status").click }
-  action(:sort_open) { |b| b.frm.link(:text=>"Open").click }
-  action(:sort_due) { |b| b.frm.link(:text=>"Due").click }
-  action(:sort_scale) { |b| b.frm.link(:text=>"Scale").click }
-
-end
+end

data/lib/sambal-cle/page_objects/calendar.rb

@@ -228,8 +228,6 @@ class EventFrequency < CalendarBase
 
   action(:save_frequency) { |b| b.frm.button(:value=>"Save Frequency").click }
 
-  action(:cancel) { |b| b.frm.button(:value=>"Cancel").click }
-
   element(:event_frequency) { |b| b.frm.select(:id=>"frequencySelect") }
   element(:interval) { |b| b.frm.select(:id=>"interval") }
   element(:ends_after) { |b| b.frm.select(:name=>"count") }