sambal-cle 0.1.5 → 0.1.6

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

@@ -1,22 +1,11 @@
-
 # The page where you search for public courses and projects.
 class SearchPublic < BasePage
 
   frame_element
 
-  def home
-    @browser.frame(:index=>0).link(:text=>"Home").click
-    Login.new(@browser)
-  end
-
-  def search_for=(string)
-    @browser.frame(:index=>0).text_field(:id=>"searchbox").set(Regexp.escape(string))
-  end
-
-  def search_for_sites
-    @browser.frame(:index=>0).button(:value=>"Search for Sites").click
-    SearchPublicResults.new(@browser)
-  end
+  action(:home) { |b| b.frame(:index=>0).link(:text=>"Home").click }
+  element(:search_for) { |b| b.frame(:index=>0).text_field(:id=>"searchbox") }
+  action(:search_for_sites) { |b| b.frame(:index=>0).button(:value=>"Search for Sites").click }
 
 end
 
@@ -25,15 +14,8 @@ class SearchPublicResults < BasePage
 
   frame_element
 
-  def click_site(site_name)
-    @browser.frame(:index=>0).link(:text=>site_name).click
-    SiteSummaryPage.new(@browser)
-  end
-
-  def home
-    @browser.frame(:id=>"ifrm").link(:text=>"Home").click
-    Login.new(@browser)
-  end
+  action(:click_site) { |site_name, b| b.frame(:index=>0).link(:text=>site_name).click }
+  action(:home) { |b| b.frame(:id=>"ifrm").link(:text=>"Home").click }
 
 end
 
@@ -43,10 +25,7 @@ class SiteSummaryPage < BasePage
 
   frame_element
 
-  def return_to_list
-    @browser.frame(:index=>0).button(:value=>"Return to List").click
-    SearchPublicResults.new(@browser)
-  end
+  action(:return_to_list) { |b| b.frame(:index=>0).button(:value=>"Return to List").click }
 
   def syllabus_attachments
     links = []

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

@@ -7,8 +7,8 @@ class Realms < BasePage
 
   frame_element
 
-  action(:new_realm) { |b| b.frm.link(:text=>"New Realm").click }
-  action(:search) { |b| b.frm.link(:text=>"Search").click }
+  link("New Realm")
+  link("Search")
   element(:select_page_size) { |b| b.frm.select_list(:name=>"selectPageSize") }
   action(:next) { |b| b.frm.button(:name=>"eventSubmit_doList_next").click }
   action(:last) { |b| b.frm.button(:name=>"eventSubmit_doList_last").click }

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

@@ -10,7 +10,61 @@ class ResourcesBase < BasePage
 
   frame_element
 
-  element(:files_table) { |b| b.frm.table(:class=>/listHier lines/) }
+  class << self
+
+    def resources_elements
+      element(:files_table) { |b| b.frm.table(:class=>/listHier lines/) }
+
+      # Use this as a means of checking if the file is visible or not
+      action(:item) { |name, b| b.frm.link(:text=>name) }
+
+      # Clicks the Select button next to the specified file.
+      action(:select_file) { |filename, b| b.files_table.row(:text, /#{Regexp.escape(filename)}/).link(:text=>"Select").click }
+
+      # Clicks the Remove button.
+      action(:remove) { |b| b.frm.button(:value=>"Remove").click }
+
+      # Clicks the remove link for the specified item in the attachment list.
+      action(:remove_item) { |file_name, b| b.files_table.row(:text=>/#{Regexp.escape(file_name)}/).link(:href=>/doRemoveitem/).click }
+
+      # Clicks the Move button.
+      action(:move) { |b| b.frm.button(:value=>"Move").click }
+
+      # Clicks the Show Other Sites link.
+      action(:show_other_sites) { |b| b.frm.link(:text=>"Show other sites").click }
+
+      action(:href) { |item, b| b.frm.link(:text=>item).href }
+
+      # Clicks on the specified folder image, which
+      # will open the folder tree and remain on the page.
+      action(:open_folder) { |foldername, b| b.files_table.row(:text=>/#{Regexp.escape(foldername)}/).link(:title=>"Open this folder").click }
+
+      # Clicks on the specified folder name, which should open
+      # the folder contents on a refreshed page.
+      action(:go_to_folder) { |foldername, b| b.frm.link(:text=>foldername).click }
+
+      # Sets the URL field to the specified value.
+      action(:url=) { |url_string, b| b.frm.text_field(:id=>"url").set(url_string) }
+
+      # Clicks the Add button next to the URL field.
+      action(:add) { |b| b.frm.button(:value=>"Add").click }
+
+      # Gets the value of the access level cell for the specified
+      # file.
+      action(:access_level) { |filename, b| b.files_table.row(:text=>/#{Regexp.escape(filename)}/)[6].text }
+
+      element(:upload_file_field) { |b| b.frm.file_field(:id=>"upload") }
+
+    end
+
+  end
+
+end
+
+# Resources page for a given Site, in the Course Tools menu
+class Resources < ResourcesBase
+
+  resources_elements
 
   # Returns an array of the displayed folder names.
   def folder_names
@@ -37,84 +91,6 @@ class ResourcesBase < BasePage
     names
   end
 
-  # Use this as a means of checking if the file is visible or not
-  def item(name)
-    frm.link(:text=>name)
-  end
-
-  # Clicks the Select button next to the specified file.
-  def select_file(filename)
-    files_table.row(:text, /#{Regexp.escape(filename)}/).link(:text=>"Select").click
-  end
-
-  # Clicks the Remove button.
-  action(:remove) { |b| b.frm.button(:value=>"Remove").click }
-
-  # Clicks the remove link for the specified item in the attachment list.
-  def remove_item(file_name)
-    files_table.row(:text=>/#{Regexp.escape(file_name)}/).link(:href=>/doRemoveitem/).click
-  end
-
-  # Clicks the Move button.
-  action(:move) { |b| b.frm.button(:value=>"Move").click }
-
-  # Clicks the Show Other Sites link.
-  action(:show_other_sites) { |b| b.frm.link(:text=>"Show other sites").click }
-
-  def href(item)
-    frm.link(:text=>item).href
-  end
-
-  # Clicks on the specified folder image, which
-  # will open the folder tree and remain on the page.
-  def open_folder(foldername)
-    files_table.row(:text=>/#{Regexp.escape(foldername)}/).link(:title=>"Open this folder").click
-  end
-
-  # Clicks on the specified folder name, which should open
-  # the folder contents on a refreshed page.
-  def go_to_folder(foldername)
-    frm.link(:text=>foldername).click
-  end
-
-  # Sets the URL field to the specified value.
-  def url=(url_string)
-    frm.text_field(:id=>"url").set(url_string)
-  end
-
-  # Clicks the Add button next to the URL field.
-  action(:add) { |b| b.frm.button(:value=>"Add").click }
-
-  # Gets the value of the access level cell for the specified
-  # file.
-  def access_level(filename)
-    files_table.row(:text=>/#{Regexp.escape(filename)}/)[6].text
-  end
-
-  def edit_details(name)
-    open_actions_menu(name)
-    files_table.row(:text=>/#{Regexp.escape(name)}/).link(:text=>"Edit Details").click
-  end
-
-  def edit_content(html_page_name)
-    open_actions_menu(html_page_name)
-    files_table.row(:text=>/#{Regexp.escape(html_page_name)}/).link(:text=>"Edit Content").click
-  end
-
-  # Clicks the Create Folders menu item in the
-  # Add menu of the specified folder.
-  def create_subfolders_in(folder_name)
-    open_add_menu(folder_name)
-    files_table.row(:text=>/#{Regexp.escape(folder_name)}/).link(:text=>"Create Folders").click
-  end
-
-  def create_html_page_in(folder_name)
-    open_add_menu(folder_name)
-    files_table.row(:text=>/#{Regexp.escape(folder_name)}/).link(:text=>"Create HTML Page").click
-  end
-
-  element(:upload_file_field) { |b| b.frm.file_field(:id=>"upload") }
-
   # Enters the specified file into the file field name (assuming it's in the
   # data/sakai-cle-test-api folder or a subfolder therein)
   #
@@ -150,10 +126,9 @@ class ResourcesBase < BasePage
     end
     files_table.row(:text=>/#{Regexp.escape(folder_name)}/).link(:text=>"Upload Files").click
   end
-  alias upload_file_to_folder upload_files_to_folder
 
   # Clicks the "Attach a copy" link for the specified
-  # file, then reinstantiates the Class.
+  # file.
   # If an alert box appears, the method will call itself again.
   # Note that this can lead to an infinite loop. Will need to fix later.
   def attach_a_copy(file_name)
@@ -193,6 +168,28 @@ class ResourcesBase < BasePage
     end
   end
 
+  def edit_details(name)
+    open_actions_menu(name)
+    files_table.row(:text=>/#{Regexp.escape(name)}/).link(:text=>"Edit Details").click
+  end
+
+  def edit_content(html_page_name)
+    open_actions_menu(html_page_name)
+    files_table.row(:text=>/#{Regexp.escape(html_page_name)}/).link(:text=>"Edit Content").click
+  end
+
+  # Clicks the Create Folders menu item in the
+  # Add menu of the specified folder.
+  def create_subfolders_in(folder_name)
+    open_add_menu(folder_name)
+    files_table.row(:text=>/#{Regexp.escape(folder_name)}/).link(:text=>"Create Folders").click
+  end
+
+  def create_html_page_in(folder_name)
+    open_add_menu(folder_name)
+    files_table.row(:text=>/#{Regexp.escape(folder_name)}/).link(:text=>"Create HTML Page").click
+  end
+
   # Clicks the Continue button
   def continue
     frm.div(:class=>"highlightPanel").span(:id=>"submitnotifxxx").wait_while_present
@@ -207,17 +204,12 @@ class ResourcesBase < BasePage
     files_table.row(:text=>/#{Regexp.escape(name)}/).li(:text=>/Action/, :class=>"menuOpen").fire_event("onclick")
   end
 
-end
-
-# Resources page for a given Site, in the Course Tools menu
-class Resources < ResourcesBase
-
-
-
 end
 
 class ResourcesUploadFiles < ResourcesBase
 
+  resources_elements
+
   @@filex=0 # TODO: This is almost certainly not going to work right.
 
   # Enters the specified folder/filename value into
@@ -254,48 +246,29 @@ class EditFileDetails < ResourcesBase
 
   # Clicks the Update button, then instantiates
   # the Resources page class.
-  def update
-    frm.button(:value=>"Update").click
-    Resources.new(@browser)
-  end
+  action(:update) { |b| b.frm.button(:value=>"Update").click }
 
   # Enters the specified string into the title field.
-  def title=(title)
-    frm.text_field(:id=>"displayName_0").set(title)
-  end
+  element(:title) { b.frm.text_field(:id=>"displayName_0") }
 
   # Enters the specified string into the description field.
-  def description=(description)
-    frm.text_field(:id=>"description_0").set(description)
-  end
+  element(:description) { |b| b.frm.text_field(:id=>"description_0") }
 
-  # Sets the radio button for publically viewable.
-  def select_publicly_viewable
-    frm.radio(:id=>"access_mode_public_0").set
-  end
+  element(:publicly_viewable) { |b| b.frm.radio(:id=>"access_mode_public_0") }
 
-  # Checks the checkbox for showing only on the specifed
-  # condition.
-  def check_show_only_if_condition
-    frm.checkbox(:id=>"cbCondition_0")
-  end
+  element(:show_only_if_condition) { |b| b.frm.checkbox(:id=>"cbCondition_0") }
 
   # Selects the specified Gradebook item value in the
   # select list.
-  def gradebook_item=(item)
-    frm.select(:id=>"selectResource_0").select(item)
-  end
+  element(:gradebook_item) { |b| b.frm.select(:id=>"selectResource_0") }
 
   # Selects the specified value in the item condition
   # field.
-  def item_condition=(condition)
-    frm.select(:id=>"selectCondition_0").select(condition)
-  end
+  element(:item_condition) { |b| b.frm.select(:id=>"selectCondition_0") }
 
   # Sets the Grade field to the specified value.
-  def assignment_grade=(grade)
-    frm.text_field(:id=>"assignment_grade_0").set(grade)
-  end
+  element(:assignment_grade) { |b| b.frm.text_field(:id=>"assignment_grade_0") }
+
 end
 
 class CreateFolders < ResourcesBase

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

@@ -0,0 +1 @@
+# Work to be done here.

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

@@ -7,10 +7,7 @@ class Roster < BasePage
 
   frame_element
 
-  def find
-    frm.button(:value=>"Find").click
-    Roster.new @browser
-  end
+  button("Find")
 
   def names
     list = []
@@ -25,11 +22,7 @@ class Roster < BasePage
   # Then instantiates the RosterProfileView class.
   # Note that it expects an exact match for the name string, otherwise
   # the script will error out.
-  def view(name)
-    frm.link(:text=>name).click
-    RosterProfileView.new @browser
-  end
-
+  action(:view) { |name, b| b.frm.link(:text=>name).click }
 
   element(:name_or_id) { |b| b.frm.text_field(:id=>"roster_form:search") }
 
@@ -40,10 +33,7 @@ class RosterProfileView < BasePage
 
   frame_element
 
-  def back
-    frm.button(:value=>"Back").click
-    Roster.new(@browser)
-  end
+  button("Back")
 
   # Returns a hash containing the contents of the Public Information
   # table on the page, with the keys being the row headers and the values

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

@@ -23,12 +23,8 @@ class Rwiki < RwikiBase
   action(:save) { |b| b.frm.button(text: "Save").click }
   action(:cancel) { |b| b.frm.button(text: "Cancel").click }
 
-  def open_wiki(title)
-    frm.link(:text=>title).click
-  end
+  action(:open_wiki) { |title, b| b.frm.link(:text=>title).click }
 
-  def wiki_href(title)
-    frm.link(:text=>title).href
-  end
+  action(:wiki_href) { |title, b| b.frm.link(:text=>title).href }
 
 end

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

@@ -7,7 +7,7 @@ class Search < BasePage
 
   frame_element
 
-  action(:admin) { |b| b.frm.link(:text=>"Admin").click }
+  link "Admin"
   element(:search_field) { |b| b.frm.text_field(:id=>"search") }
   action(:search_button) { |b| b.frm.button(:name=>"sb").click }
   element(:this_site) { |b| b.frm.radio(:id=>"searchSite") }
@@ -21,14 +21,14 @@ class SearchAdmin < BasePage
 
   frame_element
 
-  action(:search) { |b| b.frm.link(:text=>"Search").click }
-  action(:rebuild_site_index) { |b| b.frm.link(:text=>"Rebuild Site Index").click }
-  action(:refresh_site_index) { |b| b.frm.link(:text=>"Refresh Site Index").click }
-  action(:rebuild_whole_index) { |b| b.frm.link(:text=>"Rebuild Whole Index").click }
-  action(:refresh_whole_index) { |b| b.frm.link(:text=>"Refresh Whole Index").click }
-  action(:remove_lock) { |b| b.frm.link(:text=>"Remove Lock").click }
-  action(:reload_index) { |b| b.frm.link(:text=>"Reload Index").click }
-  action(:enable_diagnostics) { |b| b.frm.link(:text=>"Enable Diagnostics").click }
-  action(:disable_diagnostics) { |b| b.frm.link(:text=>"Disable Diagnostics").click }
+  link "Search"
+  link "Rebuild Site Index"
+  link "Refresh Site Index"
+  link "Rebuild Whole Index"
+  link "Refresh Whole Index"
+  link "Remove Lock"
+  link "Reload Index"
+  link "Enable Diagnostics"
+  link "Disable Diagnostics"
 
 end

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

@@ -9,12 +9,10 @@ class SectionsBase < BasePage
 
   class << self
     def menu_elements
-      # Clicks the Add Sections button/link and instantiates
-      # the AddEditSections Class.
-      action(:add_sections) { |b| b.frm.link(:text=>"Add Sections").click }
-      action(:overview) { |b| b.frm.link(:text=>"Overview").click }
-      action(:student_memberships) { |b| b.frm.link(:text=>"Student Memberships").click }
-      action(:options) { |b| b.frm.link(:text=>"Options").click }
+      link("Add Sections")
+      link("Overview")
+      link("Student Memberships")
+      link("Options")
     end
   end
 end
@@ -26,24 +24,13 @@ class Sections < SectionsBase
 
   # Clicks the Edit link for the specified section.
   # Then instantiates the AddEditSections class.
-  def edit(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).link(:text=>/Edit/).click
-    AddEditSections.new(@browser)
-  end
+  action(:edit) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).link(:text=>/Edit/).click }
 
-  def assign_tas(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).link(:text=>/Assign TAs/).click
-    AssignTeachingAssistants.new(@browser)
-  end
+  action(:assign_tas) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).link(:text=>/Assign TAs/).click }
 
-  def assign_students(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).link(:text=>/Assign Students/).click
-    AssignStudents.new(@browser)
-  end
+  action(:assign_students) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).link(:text=>/Assign Students/).click }
 
-  def check(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).checkbox(:name=>/remove/).set
-  end
+  action(:check) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/).checkbox(:name=>/remove/).set }
 
   def section_names
     names = []
@@ -55,49 +42,30 @@ class Sections < SectionsBase
     return names
   end
 
-  def remove_sections
-    frm.button(:value=>"Remove Sections").click
-    Sections.new(@browser)
-  end
+  button("Remove Sections")
 
   # Returns the text of the Teach Assistant cell for the specified
   # Section.
-  def tas_for(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[1].text
-  end
+  action(:tas_for) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[1].text }
 
   #
-  def days_for(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[2].text
-  end
+  action(:days_for) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[2].text }
 
   #
-  def time_for(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[3].text
-  end
+  action(:time_for) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[3].text }
 
   #
-  def location_for(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[4].text
-  end
+  action(:location_for) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[4].text }
 
   #
-  def current_size_for(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[5].text
-  end
+  action(:current_size_for) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[5].text }
 
   #
-  def availability_for(title)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[6].text
-  end
+  action(:availability_for) { |title, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(title)}/)[6].text }
 
-  def alert_text
-    frm.div(:class=>"validation").text
-  end
+  value(:alert_text) { |b| b.frm.div(:class=>"validation").text }
 
-  def success_text
-    frm.div(:class=>"success").text
-  end
+  value(:success_text) { |b| b.frm.div(:class=>"success").text }
 
 end
 
@@ -111,14 +79,7 @@ class AddEditSections < SectionsBase
   menu_elements
 
   # The Update button is only available when editing an existing Sections record.
-  def update
-    frm.button(:value=>"Update").click
-    if frm.div(:class=>"validation").exist?
-      AddEditSections.new(@browser)
-    else
-      Sections.new(@browser)
-    end
-  end
+  button("Update")
 
   # This method takes an array object containing strings of the
   # days of the week and then clicks the appropriate checkboxes, based
@@ -155,41 +116,39 @@ class AddEditSections < SectionsBase
 
 end
 
-#
-class AssignTeachingAssistants < SectionsBase
+class AssignBase < SectionsBase
 
   menu_elements
 
-  def assign_TAs
-    frm.button(:value=>"Assign TAs").click
-    Sections.new(@browser)
-  end
+  class << self
+    def assign_elements
+      element(:available_tas) { |b| b.frm.select(:id=>"memberForm:availableUsers") }
+      element(:assigned_tas) { |b| b.frm.select(:id=>"memberForm:selectedUsers") }
+      action(:assign) { |b| b.frm.button(:value=>">").click }
+      action(:unassign) { |b| b.frm.button(:value=>"<").click }
+      action(:assign_all) { |b| b.frm.button(:value=>">>").click }
+      action(:unassign_all) { |b| b.frm.button(:value=>"<<").click }
+    end
 
-  element(:available_tas) { |b| b.frm.select(:id=>"memberForm:availableUsers") }
-  element(:assigned_tas) { |b| b.frm.select(:id=>"memberForm:selectedUsers") }
-  action(:assign) { |b| b.frm.button(:value=>">").click }
-  action(:unassign) { |b| b.frm.button(:value=>"<").click }
-  action(:assign_all) { |b| b.frm.button(:value=>">>").click }
-  action(:unassign_all) { |b| b.frm.button(:value=>"<<").click }
+  end
 
 end
 
 #
-class AssignStudents < SectionsBase
+class AssignTeachingAssistants < AssignBase
 
-  menu_elements
+  assign_elements
 
-  def assign_students
-    frm.button(:value=>"Assign students").click
-    Sections.new(@browser)
-  end
+  button "Assign TAs"
+
+end
+
+#
+class AssignStudents < AssignBase
+
+  assign_elements
 
-  element(:available_students) { |b| b.frm.select(:id=>"memberForm:availableUsers") }
-  element(:assigned_students) { |b| b.frm.select(:id=>"memberForm:selectedUsers") }
-  action(:assign) { |b| b.frm.button(:value=>">").click }
-  action(:unassign) { |b| b.frm.button(:value=>"<").click }
-  action(:assign_all) { |b| b.frm.button(:value=>">>").click }
-  action(:unassign_all) { |b| b.frm.button(:value=>"<<").click }
+  button "Assign students"
 
 end