sambal-cle 0.1.5 → 0.1.6

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

@@ -9,7 +9,7 @@ class ChatRoom < BasePage
 
   value(:total_messages_shown) { |b| b.frame(:class=>"wcwmenu").div(:id=>"chat2_messages_shown_total").text }
 
-  action(:options) { |b| b.frm.link(text: "Options").click }
+  link "Options"
 
 end
 
@@ -17,6 +17,6 @@ class ManageRooms < BasePage
 
   frame_element
 
-  action(:add_room) { |b| b.frm.link(text: "Add Room").click }
+  link "Add Room"
 
 end

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

@@ -3,8 +3,7 @@ class EmailArchive < BasePage
 
   frame_element
 
-  # EmailArchiveOptions
-  action(:options){ |b| b.frm.link(:text=>"Options").click }
+  link "Options"
 
   # Returns an array containing the
   def email_list

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

@@ -2,55 +2,76 @@
 # Evaluation System Pages
 #================
 
-# The "Evaluations Dashboard"
-class EvaluationSystem < BasePage
+class EvaluationSystemBase < BasePage
 
   frame_element
 
-  # MyTemplates
-  action(:my_templates) { |b| b.frm.link(:text=>"My Templates").click }
+  class << self
 
-  # AddTemplateTitle
-  action(:add_template) { |b| b.frm.link(:text=>"Add Template").click }
+    def menu_elements
+      link("Administrate")
+      link("Evaluations dashboard")
+      link("My Evaluations")
+      link("My Templates")
+      link("My Items")
+      link("My Scales")
+      link("My Email Templates")
+      action(:take_evaluation) { |evaluation_name, b| b.frm.div(:class=>"summaryBox").table(:text=>/#{Regexp.escape(evaluation_name)}/).link.click }
+      action(:status_of) { |evaluation_name, b| b.frm.div(:class=>"summaryBox").table(:text=>/#{Regexp.escape(evaluation_name)}/)[1][1].text }
 
-  # TakeEvaluation
-  def take_evaluation(evaluation_name)
-    frm.div(:class=>"summaryBox").table(:text=>/#{Regexp.escape(evaluation_name)}/).link.click
-    TakeEvaluation.new(@browser)
-  end
+    end
 
-  def status_of(evaluation_name)
-    frm.div(:class=>"summaryBox").table(:text=>/#{Regexp.escape(evaluation_name)}/)[1][1].text
   end
 
 end
 
-#
-class AddTemplateTitle < BasePage
+class EvaluationAdministrate < EvaluationSystemBase
 
-  frame_element
+  menu_elements
 
-  def save
-    frm.button(:value=>"Save").click
-    EditTemplate.new(@browser)
-  end
+  # TODO: The "Search" link will need to be defined differently because there are multiple "Searches" on the page
+
+  link("Control Reporting")
+  link("Control Email Settings")
+  link("Control Eval Admin")
+  link("Test EvalGroupProvider")
+  link("Synchronize Group Memberships")
+
+  button("Save Settings")
+
+end
+
+class EvaluationsDashboard < EvaluationSystemBase
+
+  menu_elements
+
+  link("Add Template")
+  link("Add Evaluation")
+
+end
+
+#
+class AddTemplateTitle < EvaluationSystemBase
+
+  menu_elements
+  basic_page_elements
 
   element(:title) { |b| b.frm.text_field(:id=>"title") }
   element(:description) { |b| b.frm.text_area(:id=>"description") }
 
 end
 
-
 #
 class EditTemplate < BasePage
 
+  include FCKEditor
   frame_element
 
   def item_text=(text)
     frm.frame(:id, "item-text___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
-  action(:new_evaluation) { |b| b.frm.link(:text=>"New evaluation").click }
+  link("New evaluation")
 
   def add
     frm.button(:value=>"Add").click
@@ -60,10 +81,10 @@ class EditTemplate < BasePage
   def save_item
     frm.button(:value=>"Save item").click
     frm.link(:text=>"New evaluation").wait_until_present
-    EditTemplate.new @browser
   end
 
   element(:item) { |b| b.frm.select_list(:id=>"add-item-control::add-item-classification-selection").click }
+
 end
 
 
@@ -77,10 +98,7 @@ class NewEvaluation < BasePage
 
   element(:editor) { |b| b.frm.frame(:id, "instructions:1:input___Frame") }
 
-  def continue_to_settings
-    frm.button(:value=>"Continue to Settings").click
-    EvaluationSettings.new(@browser)
-  end
+  button("Continue to Settings")
 
   def instructions=(text)
     frm.frame(:id, "instructions:1:input___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
@@ -90,37 +108,29 @@ class NewEvaluation < BasePage
 
 end
 
-
 #
 class EvaluationSettings < BasePage
 
   frame_element
 
-  def continue_to_assign_to_courses
-    frm.button(:value=>"Continue to Assign to Courses").click
-    EditEvaluationAssignment.new(@browser)
-  end
-
+  button("Continue to Assign to Courses")
 
 end
 
-
 #
 class EditEvaluationAssignment < BasePage
 
   frame_element
 
-  def save_assigned_groups
-    frm.button(:value=>"Save Assigned Groups").click
-    ConfirmEvaluation.new(@browser)
-  end
+  button("Save Assigned Groups")
 
   def check_group(title)
     frm.table(:class=>"listHier lines nolines").wait_until_present
     frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(title)}/).checkbox(:name=>"selectedGroupIDs").set
   end
 
-  action(:assign_to_evaluation_groups) { |b| b.frm.link(:text=>"Assign to Evaluation Groups").click }
+  link("Assign to Evaluation Groups")
+
 end
 
 
@@ -129,18 +139,40 @@ class ConfirmEvaluation < BasePage
 
   frame_element
 
-  def done
-    frm.button(:value=>"Done").click
-    MyEvaluations.new(@browser)
-  end
+  action(:done) { |b| b.frm.button(:value=>"Done").click }
 
 end
 
 #
-class MyEvaluations < BasePage
+class MyEvaluations < EvaluationSystemBase
 
-  frame_element
+  menu_elements
+
+  link("Add Evaluation")
 
+end
+
+class MyTemplates < EvaluationSystemBase
+
+  menu_elements
+
+end
+
+class MyItems < EvaluationSystemBase
+
+  menu_elements
+
+end
+
+class MyScales < EvaluationSystemBase
+
+  menu_elements
+
+end
+
+class MyEmailTemplates < EvaluationSystemBase
+
+  menu_elements
 
 end
 
@@ -149,10 +181,6 @@ class TakeEvaluation < BasePage
 
   frame_element
 
-  def submit_evaluation
-    frm.button(:value=>"Submit Evaluation").click
-    EvaluationSystem.new(@browser)
-  end
-
+  action(:submit_evaluation) { |b| b.frm.button(:value=>"Submit Evaluation").click }
 
 end

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

@@ -7,10 +7,7 @@ class Feedback < BasePage
 
   frame_element
 
-  def add
-    frm.link(:text=>"Add").click
-    AddUpdateFeedback.new(@browser)
-  end
+  link "Add"
 
   # Returns an array containing the titles
   # of the Feedback items listed on the page.
@@ -30,7 +27,6 @@ class AddUpdateFeedback < BasePage
 
   frame_element
 
-
   element(:title) { |b| b.frm.text_field(:id=>"_idJsp1:title") }
 
 end

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

@@ -7,26 +7,13 @@ class Forms < BasePage
 
   frame_element
 
-  # Clicks the Add button and instantiates
-  # the AddForm Class.
-  def add
-    frm.link(:text=>"Add").click
-    AddForm.new(@browser)
-  end
+  link "Add"
 
   # Clicks the Publish buton for the specified
-  # Form, then instantiates the PublishForm Class.
-  def publish(form_name)
-    frm.table(:class=>"listHier lines nolines").tr(:text, /#{Regexp.escape(form_name)}/).link(:text=>/Publish/).click
-    PublishForm.new(@browser)
-  end
+  # Form
+  action(:publish) { |form_name, b| b.frm.table(:class=>"listHier lines nolines").tr(:text, /#{Regexp.escape(form_name)}/).link(:text=>/Publish/).click }
 
-  # Clicks the Import button, then
-  # instantiates the ImportForms Class.
-  def import
-    frm.link(:text=>"Import").click
-    ImportForms.new(@browser)
-  end
+  link "Import"
 
 end
 
@@ -34,35 +21,24 @@ class ImportForms < BasePage
 
   frame_element
 
-  def import
-    frm.button(:value=>"Import").click
-    Forms.new(@browser)
-  end
+  button "Import"
 
-  def select_file
-    frm.link(:text=>"Select File...").click
-    AttachFileFormImport.new(@browser)
-  end
+  link "Select File..."
 
 end
 
 class AddForm < BasePage
 
+  include FCKEditor
   frame_element
 
-  def select_schema_file
-    frm.link(:text=>"Select Schema File").click
-    SelectSchemaFile.new(@browser)
-  end
+  link "Select Schema File"
 
   def instruction=(text)
     frm.frame(:id, "instruction___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
-  def add_form
-    frm.button(:value=>"Add Form").click
-    Forms.new(@browser)
-  end
+  button "Add Form"
 
   element(:name) { |b| b.frm.text_field(:id=>"description-id") }
 
@@ -73,21 +49,11 @@ class SelectSchemaFile < BasePage
 
   frame_element
 
-  def show_other_sites
-    frm.link(:title=>"Show other sites").click
-    SelectSchemaFile.new(@browser)
-  end
+  action(:show_other_sites) { |b| b.frm.link(:title=>"Show other sites").click }
 
-  def open_folder(name)
-    frm.link(:text=>name).click
-    SelectSchemaFile.new(@browser)
-  end
+  action(:open_folder) { |name, b| b.frm.link(:text=>name).click }
 
-  def select_file(filename)
-    index = file_names.index(filename)
-    frm.table(:class=>"listHier lines").tr(:text, /#{Regexp.escape(filename)}/).link(:text=>"Select").click
-    SelectSchemaFile.new(@browser)
-  end
+  action(:select_file) { |filename, b| b.frm.table(:class=>"listHier lines").tr(:text, /#{Regexp.escape(filename)}/).link(:text=>"Select").click }
 
   def file_names #FIXME
     names = []
@@ -100,11 +66,7 @@ class SelectSchemaFile < BasePage
     return names
   end
 
-  def continue
-    frm.button(:value=>"Continue").click
-    frm.frame(:id, "instruction___Frame").td(:id, "xEditingArea").wait_until_present
-    AddForm.new(@browser)
-  end
+  button "Continue"
 
 end
 
@@ -112,9 +74,6 @@ class PublishForm < BasePage
 
   frame_element
 
-  def yes
-    frm.button(:value=>"Yes").click
-    Forms.new(@browser)
-  end
+  button "Yes"
 
 end

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

@@ -18,10 +18,10 @@ class Forums < BasePage
   end
 
   # OrganizeForums
-  action(:organize) { |b| b.frm.link(:text=>"Organize").click }
+  link "Organize"
 
   # ForumTemplateSettings
-  action(:template_settings) { |b| b.frm.link(:text=>"Template Settings").click }
+  link "Template Settings"
 
   element(:forums_table) { |b| b.frm.div(:class=>"portletBody").table(:id=>"msgForum:forums") }
 
@@ -76,7 +76,7 @@ class TopicPage < BasePage
   frame_element
 
   # ComposeForumMessage
-  action(:post_new_thread) { |b| b.frm.link(:text=>"Post New Thread").click }
+  link "Post New Thread"
 
   def thread_titles
     titles = []
@@ -93,7 +93,7 @@ class TopicPage < BasePage
   end
 
   # TopicPage
-  action(:display_entire_message){ |b| b.frm.link(:text=>"Display Entire Message").click }
+  link "Display Entire Message"
 
 end
 
@@ -102,7 +102,7 @@ class ViewForumThread < BasePage
   frame_element
 
   # ComposeForumMessage
-  action(:reply_to_thread) { |b| b.frm.link(:text=>"Reply to Thread").click }
+  link "Reply to Thread"
 
   # ComposeForumMessage
   # TODO: Figure out a better way to do this...
@@ -119,7 +119,7 @@ class ComposeForumMessage < BasePage
   expected_element :editor
 
   # TopicPage, probably
-  action(:post_message) { |b| b.frm.button(:text=>"Post Message").click }
+  button "Post Message"
 
   element(:editor) { |b| b.frm.frame(:id, "dfCompose:df_compose_body_inputRichText___Frame") }
 
@@ -129,7 +129,7 @@ class ComposeForumMessage < BasePage
 
   value(:reply_text) { |b| b.frame(:index=>1).div(:class=>"singleMessageReply").text }
 
-  action(:cancel) { |b| b.frm.button(:value=>"Cancel").click }
+  button "Cancel"
 
   element(:title) { |b| b.frm.text_field(:id=>"dfCompose:df_compose_title") }
 
@@ -138,23 +138,16 @@ end
 class ForumTemplateSettings < BasePage
 
   frame_element
+  basic_page_elements
 
   value(:page_title) { |b| b.frm.div(:class=>"portletBody").h3(:index=>0).text }
 
-  # Forums
-  action(:save) { |b| b.frm.button(:value=>"Save").click }
-
-  # Forums
-  action(:cancel) { |b| b.frm.button(:value=>"Cancel").click }
-
 end
 
 class OrganizeForums < BasePage
 
   frame_element
-
-  # Forums
-  action(:save) { |b| b.frm.button(:value=>"Save").click }
+  basic_page_elements
 
   # These are set to so that the user
   # does not have to start the list at zero...
@@ -172,10 +165,7 @@ class EditForum < BasePage
 
   include FCKEditor
   frame_element
-
-  # Forums
-  action(:save) { |b| b.frm.button(:value=>"Save").click }
-  action(:cancel) { |b| b.frm.button(:value=>"Cancel").click }
+  basic_page_elements
 
   # AddEditTopic
   action(:save_and_add) { |b| b.frm.button(:value=>"Save Settings & Add Topic").click }
@@ -198,6 +188,7 @@ class AddEditTopic < BasePage
 
   include FCKEditor
   frame_element
+  basic_page_elements
 
   @@table_index=0 # TODO: Seriously think about a better way to do this
 
@@ -209,10 +200,6 @@ class AddEditTopic < BasePage
     editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
-  # Forums
-  action(:save) { |b| b.frm.button(:value=>"Save").click }
-  action(:cancel) { |b| b.frm.button(:value=>"Cancel").click }
-
   action(:add_attachments) { |b| b.frm.button(:value=>/Add.+ttachment/).click }
 
   def roles