sambal-cle 0.1.4 → 0.1.5

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

@@ -192,18 +192,18 @@ class AssignmentsList < AssignmentsBase
 
   # Clicks the Edit link for the assignment with the specified
   # id, then instantiates the AssignmentAdd page class.
-  page_method(:edit_assignment_id) { |id, b| b.frm.link(:href=>/#{Regexp.escape(id)}/).click }
+  action(: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.
-  page_method(:edit_assignment) { |assignment_name, b|
+  action(: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.
-  page_method(:delete) { |assignment_name, b|
+  action(: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
@@ -211,33 +211,33 @@ class AssignmentsList < AssignmentsBase
 
   # Clicks on the Duplicate link for the Assignment specified.
   # Then instantiates the AssignmentsList page class.
-  page_method(:duplicate) { |assignment_name, b|
+  action(: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.
-  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 }
+  action(:get_assignment_id) { |assignment_name, b| b.assignment_href(assignment_name) =~ /(?<=\/a\/\S{36}\/).+(?=&pan)/; $~.to_s }
+  action(: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.
-  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 }
+  action(:check_assignment) { |id,b| b.frm.checkbox(:value, /#{id}/).set } #FIXME to use name instead of id.
+  action(:open_assignment) { |assignment_name, b| b.frm.link(:text=>assignment_name).click }
 
   # Gets the contents of the status column
   # for the specified assignment
-  page_method(:status_of) { |assignment_name, b| b.assignments_table.row(:text=>/#{Regexp.escape(assignment_name)}/).td(:headers=>"status").text }
+  action(: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.
-  page_method(:view_submissions_for) { |assignment_name, b| b.assignments_table.row(:text=>/#{Regexp.escape(assignment_name)}/).link(:text=>"View Submissions").click }
+  action(: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.
-  page_method(:grade) { |assignment_name, b| b.assignments_table.row(:text=>/#{Regexp.escape(assignment_name)}/).link(:text=>"Grade").click }
+  action(: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 }
@@ -312,7 +312,7 @@ class AssignmentsPreview < AssignmentsBase
   end
 
   # Grabs the Assignment Instructions text.
-  value(:instructions) { |b| b.frm.div(:class=>"textPanel").text }
+  value(:instructions) { |b| b.frm.div(:id=>"instructions").text }
 
   # Grabs the instructor comments text.
   value(:instructor_comments) { |b| b.frm.div(:class=>"portletBody").div(:class=>"textPanel", :index=>2).text }
@@ -396,10 +396,10 @@ class AssignmentStudentView < BasePage
   action(:back_to_list) { |b| b.frm.button(:value=>"Back to list").click }
   action(:preview) { |p| p.preview_button.click }
 
-  element(:instructor_comment_field) { |b| b.frm.form(:name=>"addSubmissionForm").div(:class=>"textPanel", :index=>1) }
+  element(:instructor_comment_field) { |b| b.frm.div(:id=>"instructor_comment") }
 
-  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(:instructions) { |b| b.frm.div(:id=>"instructions").text }
+  value(:submission_text) { |b| b.frm.div(:id=>"submission").text }
   value(:instructor_comments) { |p| p.instructor_comment_field.text }
 
   # Returns an array of strings. Each element in the
@@ -458,7 +458,7 @@ class AssignmentSubmissionList < AssignmentsBase
 
   # Clicks the Grade link for the specified student, then
   # instantiates the AssignmentSubmission page class.
-  pgmd(:grade) { |student_name, b| b.frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(student_name)}/).link(:text=>"Grade").click }
+  action(: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
@@ -467,7 +467,7 @@ class AssignmentSubmissionList < AssignmentsBase
   # students with the same name.
   #
   # Useful for verification purposes.
-  pgmd(:submission_status_of) { |student_name, b| b.frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(student_name)}/)[4].text }
+  action(: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 }

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

@@ -6,31 +6,15 @@ class Glossary < BasePage
 
   frame_element
 
-  def add
-    frm.link(:text=>"Add").click
-    frm.frame(:id, "longDescription___Frame").td(:id, "xEditingArea").wait_until_present
-    AddEditTerm.new(@browser)
-  end
-
-  def import
-    frm.link(:text=>"Import").click
-    GlossaryImport.new(@browser)
-  end
+  action(:add) { |b| b.frm.link(:text=>"Add").click }
+  action(:import) { |b| b.frm.link(:text=>"Import").click }
 
-  def edit(term)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(term)}/).link(:text=>"Edit").click
-    AddEditTerm.new(@browser)
-  end
-
-  def delete(term)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(term)}/).link(:text=>"Delete").click
-    AddEditTerm.new(@browser)
-  end
+  action(:edit) { |term, b| b.frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(term)}/).link(:text=>"Edit").click }
+  action(:delete) { |term, b| b.frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(term)}/).link(:text=>"Delete").click }
 
-  def open(term)
-    frm.link(:text=>term).click
-    #FIXME!
-    # Need to do special handling here because of the new window.
+  action(:open) do |term, b|
+    b.frm.link(:text=>term).click
+    b.window(:title=>term).use
   end
 
   # Returns an array containing the string values of the terms
@@ -48,23 +32,24 @@ end
 
 class AddEditTerm < BasePage
 
+  include FCKEditor
   frame_element
 
+  expected_element :editor
+
   def add_term
     frm.button(:value=>"Add Term").click
-    Glossary.new(@browser)
   end
 
   def save_changes
     frm.button(:value=>"Save Changes").click
-    Glossary.new(@browser)
   end
 
   def long_description=(text)
-    frm.frame(:id, "longDescription___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
-
+  element(:editor) { |b| b.frm.frame(:id, "longDescription___Frame") }
   element(:term) { |b| b.frm.text_field(:id=>"term-id") }
   element(:short_description) { |b| b.frm.text_field(:id=>"description-id") }
 
@@ -75,43 +60,8 @@ class GlossaryImport < BasePage
 
   frame_element
 
-  def select_file
-    frm.link(:text=>"Select file...").click
-    GlossaryAttach.new(@browser)
-  end
-
-  def import
-    frm.button(:value=>"Import").click
-    Glossary.new(@browser)
-  end
-
-end
-
-# The file upload page for Glossary importing
-class GlossaryFileUpload < BasePage
-
-  frame_element
-
-  @@filex=0
+  action(:select_file) { |b| b.frm.link(:text=>"Select file...").click }
 
-  # Note that the file_to_upload method can be used
-  # multiple times, but it assumes
-  # that the add_another_file method is used
-  # before it, every time except before the first time.
-  def file_to_upload(file_name, file_path="")
-    frm.file_field(:id, "content_#{@@filex}").set(file_path + file_name)
-    @@filex+=1
-  end
-
-  def upload_files_now
-    frm.button(:value=>"Upload Files Now").click
-    sleep 0.5
-    @@filex=0
-    GlossaryAttach.new(@browser)
-  end
-
-  def add_another_file
-    frm.link(:text=>"Add Another File").click
-  end
+  action(:import) { |b| b.frm.button(:value=>"Import").click }
 
 end

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

@@ -9,74 +9,68 @@ class Matrices < BasePage
 
   # Clicks the Add link and instantiates
   # the AddEditMatrix Class.
-  def add
-    frm.link(:text=>"Add").click
-    AddEditMatrix.new(@browser)
-  end
+  action(:add) { |b| b.frm.link(:text=>"Add").click }
+  action(:import) { |b| b.frm.link(:text=>"Import").click }
+  action(:manage_site_associations) { |b| b.frm.link(:text=>"Manage Site Associations").click }
+  action(:permissions) { |b| b.frm.link(:text=>"Permissions").click }
+  action(:my_preferences) { |b| b.frm.link(:text=>"My Preferences").click }
 
   # Clicks the "Edit" link for the specified
   # Matrix item, then instantiates the EditMatrixCells.
-  def edit(matrixname)
-    frm.table(:class=>"listHier lines nolines").tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Edit").click
-    EditMatrixCells.new(@browser)
-  end
+  action(:edit) { |matrixname, b| b.matrix_table.tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Edit").click }
 
   # Clicks the "Preview" link for the specified
   # Matrix item.
-  def preview(matrixname)
-    frm.table(:class=>"listHier lines nolines").tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Preview").click
-  end
+  action(:preview) { |matrixname, b| b.matrix_table.tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Preview").click }
 
   # Clicks the "Publish" link for the specified
   # Matrix item, then instantiates the ConfirmPublishMatrix Class.
-  def publish(matrixname)
-    frm.table(:class=>"listHier lines nolines").tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Publish").click
-    ConfirmPublishMatrix.new(@browser)
-  end
+  action(:publish) { |matrixname, b| b.matrix_table.tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Publish").click }
+
+  action(:delete) { |matrixname, b| b.matrix_table.tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Delete").click }
+
+  action(:export) { |matrixname, b| b.matrix_table.tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Export").click }
 
+  action(:permissions) { |matrixname, b| b.matrix_table.tr(:text=>/#{Regexp.escape(matrixname)}/).link(:text=>"Permissions").click }
+
+  element(:matrix_table) { |b| b.frm.table(:class=>"listHier lines nolines") }
+
+  def matrices_list
+    text_array = matrix_table.to_a
+    text_array.delete_at(0) # deletes the header row which is useless
+    list=[]
+    text_array.each do |line|
+      list << line[0]
+    end
+    list
+  end
 
 end
 
 #
 class AddEditMatrix < BasePage
 
+  include FCKEditor
   frame_element
 
-  # Clicks the "Create Matrix" button and
-  # instantiates the Matrices Class.
-  def create_matrix
-    frm.button(:value=>"Create Matrix").click
-    Matrices.new(@browser)
-  end
+  expected_element :editor
 
-  # Clicks the "Save Changes" butotn and
-  # instantiates the EditMatrixCells Class.
-  def save_changes
-    frm.button(:value=>"Save Changes").click
-    EditMatrixCells.new(@browser)
-  end
+  element(:editor) { |b| b.frm.frame(:id=>"descriptionTextArea___Frame") }
 
-  # Clicks the "Select Style" link and
-  # instantiates the SelectMatrixStyle Class.
-  def select_style
-    frm.link(:text=>"Select Style").click
-    SelectMatrixStyle.new(@browser)
-  end
+  # Clicks the "Create Matrix" button
+  action(:create_matrix) { |b| b.frm.button(:value=>"Create Matrix").click }
 
-  # Clicks the "Add Column" link and
-  # instantiates the AddEditColumn Class.
-  def add_column
-    frm.link(:text=>"Add Column").click
-    AddEditColumn.new(@browser)
-  end
+  # Clicks the "Save Changes" button
+  action(:save_changes) { |b| b.frm.button(:value=>"Save Changes").click }
 
-  # Clicks the "Add Row" link and instantiates
-  # the AddEditRow Class.
-  def add_row
-    frm.link(:text=>"Add Row").click
-    AddEditRow.new(@browser)
-  end
+  # Clicks the "Select Style" link
+  action(:select_style) { |b| b.frm.link(:text=>"Select Style").click }
+
+  # Clicks the "Add Column" link
+  action(:add_column) { |b| b.frm.link(:text=>"Add Column").click }
 
+  # Clicks the "Add Row" link
+  action(:add_row) { |b| b.frm.link(:text=>"Add Row").click }
 
   element(:title) { |b| b.frm.text_field(:id=>"title-id") }
 
@@ -89,53 +83,38 @@ class SelectMatrixStyle < BasePage
 
   # Clicks the "Go Back" button and
   # instantiates the AddEditMatrix Class.
-  def go_back
-    frm.button(:value=>"Go Back").click
-    AddEditMatrix.new(@browser)
-  end
+  action(:go_back) { |b| b.frm.button(:value=>"Go Back").click }
 
   # Clicks the "Select" link for the specified
   # Style, then instantiates the AddEditMatrix Class.
-  def select_style(stylename)
-    frm.table(:class=>/listHier lines/).tr(:text=>/#{Regexp.escape(stylename)}/).link(:text=>"Select").click
-    AddEditMatrix.new(@browser)
-  end
+  action(:select_style) { |stylename, b| b.frm.table(:class=>/listHier lines/).tr(:text=>/#{Regexp.escape(stylename)}/).link(:text=>"Select").click }
 
 end
 
-#
-class AddEditColumn < BasePage
+class RowColumnCommon < BasePage
 
   frame_element
-
-  # Clicks the "Update" button, then
-  # instantiates the AddEditMatrix Class.
-  def update
-    frm.button(:value=>"Update").click
-    AddEditMatrix.new(@browser)
+  class << self
+    def table_elements
+      action(:update) { |b| b.frm.button(:value=>"Update").click }
+      element(:name) { |b| b.frm.text_field(:name=>"description") }
+      element(:background_color) { |b| b.frm.text_field(:id=>"color-id") }
+      element(:font_color) { |b| b.frm.text_field(:id=>"textColor-id") }
+    end
   end
-
-
-  element(:name) { |b| b.frm.text_field(:name=>"description") }
-
 end
 
 #
-class AddEditRow < BasePage
+class AddEditColumn < RowColumnCommon
 
-  frame_element
+  table_elements
 
-  # Clicks the "Update" button, then
-  # instantiates the AddEditMatrix Class.
-  def update
-    frm.button(:value=>"Update").click
-    AddEditMatrix.new(@browser)
-  end
+end
 
+#
+class AddEditRow < RowColumnCommon
 
-  element(:name) { |b| b.frm.text_field(:name=>"description") }
-  element(:background_color) { |b| b.frm.text_field(:id=>"color-id") }
-  element(:font_color) { |b| b.frm.text_field(:id=>"textColor-id") }
+  table_elements
 
 end
 
@@ -145,25 +124,24 @@ class EditMatrixCells < BasePage
   frame_element
 
   # Clicks on the cell that is specified, based on
-  # the row number, then the column number.
-  #
-  # Note that the numbering begins in the upper left
-  # of the Matrix, with (1, 1) being the first EDITABLE
-  # cell, NOT the first cell in the table itself.
-  #
-  # In other words, ignore the header row and header column
-  # in your count (or, if you prefer, consider those
-  # to be numbered "0").
-  def edit(row, column)
-    frm.div(:class=>"portletBody").table(:summary=>"Matrix Scaffolding (click on a cell to edit)").tr(:index=>row).td(:index=>column-1).fire_event("onclick")
-    EditCell.new(@browser)
-  end
+  # the "id" found in the onclick tag for the cell.
+  action(:edit_cell_by_id) { |id, b| b.matrix_scaffolding.td(:html=>/#{id}/).fire_event("onclick") }
 
   # Clicks the "Return to List" link and
   # instantiates the Matrices Class.
-  def return_to_list
-    frm.link(:text=>"Return to List").click
-    Matrices.new(@browser)
+  action(:return_to_list) { |b| b.frm.link(:text=>"Return to List").click }
+
+  element(:matrix_scaffolding) { |b| b.frm.div(:class=>"portletBody").table(:summary=>"Matrix Scaffolding (click on a cell to edit)") }
+
+  element(:cells) { |b| b.frm.tds(:class=>/matrix-cell-border/).to_a }
+
+  element(:column_headers) { |b| b.matrix_scaffolding.tr(:index=>0).ths.to_a }
+
+  def edit_cell_by_row_and_column(row, column)
+    columns = []
+    column_headers.each { |col| columns << col.text }
+    columns.delete_at(0)
+    matrix_scaffolding.row(:text=>/#{Regexp.escape(row)}/).td(:index=>columns.index(column)).fire_event("onclick")
   end
 
 end
@@ -173,23 +151,17 @@ class EditCell < BasePage
 
   frame_element
 
-  thing(:select_evaluators_link) { |b| b.frm.link(:text=>"Select Evaluators") }
+  expected_element :select_evaluators_link
+
+  element(:select_evaluators_link) { |b| b.frm.link(:text=>"Select Evaluators") }
 
   # Clicks the "Select Evaluators" link
   # and instantiates the SelectEvaluators Class.
-  def select_evaluators
-    select_evaluators_link.wait_until_present
-    select_evaluators_link.click
-    SelectEvaluators.new(@browser)
-  end
+  action(:select_evaluators) { |p| p.select_evaluators_link.click }
 
   # Clicks the Save Changes button and instantiates
   # the EditMatrixCells Class.
-  def save_changes
-    frm.button(:value=>"Save Changes").click
-    EditMatrixCells.new(@browser)
-  end
-
+  action(:save_changes) { |b| b.frm.button(:value=>"Save Changes").click }
 
   element(:title) { |b| b.frm.text_field(:id=>"title-id") }
   element(:use_default_reflection_form) { |b| b.frm.checkbox(:id=>"defaultReflectionForm") }
@@ -209,12 +181,7 @@ class SelectEvaluators < BasePage
 
   # Clicks the "Save" button and
   # instantiates the EditCell Class.
-  def save
-    frm.button(:value=>"Save").click
-    EditCell.new(@browser)
-  end
-
-
+  action(:save) { |b| b.frm.button(:value=>"Save").click }
   element(:users) { |b| b.frm.select(:id=>"mainForm:availableUsers") }
   element(:selected_users) { |b| b.frm.select(:id=>"mainForm:selectedUsers") }
   element(:roles) { |b| b.frm.select(:id=>"mainForm:audSubV11:availableRoles") }
@@ -233,9 +200,6 @@ class ConfirmPublishMatrix < BasePage
 
   # Clicks the "Continue" button and
   # instantiates the Matrices Class.
-  def continue
-    frm.button(:value=>"Continue").click
-    Matrices.new(@browser)
-  end
+  action(:continue) { |b| b.frm.button(:value=>"Continue").click }
 
 end

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

@@ -25,8 +25,6 @@ class Portfolios < BasePage
     frm.table(:class=>"listHier ospTable").row(:text=>/#{Regexp.escape(portfolio_name)}/)[5].text
   end
 
-
-
 end
 
 #

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

@@ -300,7 +300,7 @@ end
 
 class CreateFolders < ResourcesBase
 
-  thing(:folder_name) { |b| b.frm.text_field(:id=>"content_0") }
+  element(:folder_name) { |b| b.frm.text_field(:id=>"content_0") }
   action(:create_folders_now) { |b| b.frm.button(:value=>"Create Folders Now").click }
 
 end
@@ -310,7 +310,7 @@ class EditHTMLPageContent < BasePage
   frame_element
   include FCKEditor
 
-  thing(:editor) { |b| b.frm.frame(:id=>"content___Frame") }
+  element(:editor) { |b| b.frm.frame(:id=>"content___Frame") }
   action(:continue) { |b| b.frm.button(id: "saveChanges").click }
   element(:email_notification) { |b| b.frm.select(:id=>"notify") }
 
@@ -318,8 +318,8 @@ end
 
 class EditHTMLPageProperties < ResourcesBase
 
-  thing(:name) { |b| b.frm.text_field(id: "displayName_0") }
-  thing(:description) { |b| b.frm.text_field(id: "description_0") }
+  element(:name) { |b| b.frm.text_field(id: "displayName_0") }
+  element(:description) { |b| b.frm.text_field(id: "description_0") }
 
   action(:finish) { |b| b.frm.button(id: "finish_button").click }
 

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

@@ -349,23 +349,23 @@ class ReUseMaterial < SiteSetupBase
 
   menu_elements
 
-  thing(:announcements_checkbox) { |b| b.frm.checkbox(name: "sakai.announcements") }
-  thing(:calendar_checkbox) { |b| b.frm.checkbox(name: "sakai.schedule") }
-  thing(:discussion_forums_checkbox) { |b| b.frm.checkbox(name: "sakai.jforum.tool") }
-  thing(:forums_checkbox) { |b| b.frm.checkbox(name: "sakai.forums") }
-  thing(:chat_room_checkbox) { |b| b.frm.checkbox(name: "sakai.chat") }
-  thing(:polls_checkbox) { |b| b.frm.checkbox(name: "sakai.poll") }
-  thing(:syllabus_checkbox) { |b| b.frm.checkbox(name: "sakai.syllabus") }
-  thing(:lessons_checkbox) { |b| b.frm.checkbox(name: "sakai.melete") }
-  thing(:resources_checkbox) { |b| b.frm.checkbox(name: "sakai.resources") }
-  thing(:assignments_checkbox) { |b| b.frm.checkbox(name: "sakai.assignment.grades") }
-  thing(:tests_and_quizzes_checkbox) { |b| b.frm.checkbox(name: "sakai.samigo") }
-  thing(:gradebook_checkbox) { |b| b.frm.checkbox(name: "sakai.gradebook.tool") }
-  thing(:gradebook2_checkbox) { |b| b.frm.checkbox(name: "sakai.gradebook.gwt.rpc") }
-  thing(:wiki_checkbox) { |b| b.frm.checkbox(name: "sakai.rwiki") }
-  thing(:news_checkbox) { |b| b.frm.checkbox(name: "sakai.news") }
-  thing(:web_content_checkbox) { |b| b.frm.checkbox(name: "sakai.iframe") }
-  thing(:site_statistics_checkbox) { |b| b.frm.checkbox(name: "sakai.sitestats") }
+  element(:announcements_checkbox) { |b| b.frm.checkbox(name: "sakai.announcements") }
+  element(:calendar_checkbox) { |b| b.frm.checkbox(name: "sakai.schedule") }
+  element(:discussion_forums_checkbox) { |b| b.frm.checkbox(name: "sakai.jforum.tool") }
+  element(:forums_checkbox) { |b| b.frm.checkbox(name: "sakai.forums") }
+  element(:chat_room_checkbox) { |b| b.frm.checkbox(name: "sakai.chat") }
+  element(:polls_checkbox) { |b| b.frm.checkbox(name: "sakai.poll") }
+  element(:syllabus_checkbox) { |b| b.frm.checkbox(name: "sakai.syllabus") }
+  element(:lessons_checkbox) { |b| b.frm.checkbox(name: "sakai.melete") }
+  element(:resources_checkbox) { |b| b.frm.checkbox(name: "sakai.resources") }
+  element(:assignments_checkbox) { |b| b.frm.checkbox(name: "sakai.assignment.grades") }
+  element(:tests_and_quizzes_checkbox) { |b| b.frm.checkbox(name: "sakai.samigo") }
+  element(:gradebook_checkbox) { |b| b.frm.checkbox(name: "sakai.gradebook.tool") }
+  element(:gradebook2_checkbox) { |b| b.frm.checkbox(name: "sakai.gradebook.gwt.rpc") }
+  element(:wiki_checkbox) { |b| b.frm.checkbox(name: "sakai.rwiki") }
+  element(:news_checkbox) { |b| b.frm.checkbox(name: "sakai.news") }
+  element(:web_content_checkbox) { |b| b.frm.checkbox(name: "sakai.iframe") }
+  element(:site_statistics_checkbox) { |b| b.frm.checkbox(name: "sakai.sitestats") }
   action(:continue) { |b| b.frm.button(name: "eventSubmit_doContinue").click }
 
 end
@@ -525,11 +525,13 @@ end
 class ConfirmSiteSetup < BasePage
 
   frame_element
-  
+
+  element(:request_button) { |b| b.frm.button(:value=>"Request Site") }
+
   # Clicks the Request Site button, then
   # instantiates the SiteSetup Class.
-  action(:request_site){ |b| b.frm.button(:value=>"Request Site").click }
-  
+  action(:request_site){ |p| p.request_button.click }
+
   # For portfolio sites...
   # Clicks the "Create Site" button and
   # instantiates the SiteSetup class.
@@ -569,17 +571,22 @@ end
 # 
 class PortfolioSiteInfo < BasePage
 
+  include FCKEditor
   frame_element
 
+  expected_element :editor
+
+  element(:editor) { |b| b.frm.frame(:id, "description___Frame") }
+
   def description=(text)
-    frm.frame(:id, "description___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
   action(:continue) { |b| b.frm.button(:value=>"Continue").click }
 
   element(:title) { |b| b.frm.text_field(:id=>"title") }
   element(:url_alias) { |b| b.frm.text_field(:id=>"alias_0") }
-  element(:short_description) { |b| b.frm.text_area(:id=>"short_description") }
+  element(:short_description) { |b| b.frm.text_field(:id=>"short_description") }
   element(:icon_url) { |b| b.frm.text_field(:id=>"iconUrl") }
   element(:site_contact_name) { |b| b.frm.text_field(:id=>"siteContactName") }
   element(:site_contact_email) { |b| b.frm.text_field(:id=>"siteContactEmail") }
@@ -594,7 +601,8 @@ class PortfolioSiteTools < BasePage
   action(:continue) { |b| b.frm.button(:value=>"Continue").click }
 
   element(:all_tools) { |b| b.frm.checkbox(:id=>"all") }
-    
+  #TODO Add support for individual tool selection
+
 end
 
 # 

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

@@ -10,11 +10,7 @@ class Sites < BasePage
   # Clicks the first site Id link
   # listed. Useful when you've run a search and
   # you're certain you've got the result you want.
-  # It then instantiates the EditSiteInfo page class.
-  def click_top_item
-    frm.link(:href, /#{Regexp.escape("&panel=Main&sakai_action=doEdit")}/).click
-    EditSiteInfo.new(@browser)
-  end
+  action(:click_top_item) { |b| b.frm.link(:href, /#{Regexp.escape("&panel=Main&sakai_action=doEdit")}/).click }
 
   # Clicks the specified Site in the list, using the
   # specified id value to determine which item to click.
@@ -24,15 +20,9 @@ class Sites < BasePage
     frm.text_field(:id=>"search_site").value=id
     frm.link(:text=>"Site ID").click
     frm.link(:text, id).click
-    EditSiteInfo.new(@browser)
   end
 
-  # Clicks the New Site button, then instantiates
-  # the EditSiteInfo page class.
-  def new_site
-    frm.link(:text, "New Site").click
-    EditSiteInfo.new(@browser)
-  end
+  action(:new_site) { |b| b.frm.link(:text, "New Site").click }
 
   element(:search_field) { |b| b.frm.text_field(:id=>"search") }
   action(:search_button) { |b| b.frm.link(text=>"Search").click }