sambal-cle 0.1.5 → 0.1.6

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

@@ -9,10 +9,8 @@ class JobScheduler < BasePage
 
   # Clicks the Jobs link, then instantiates
   # the JobList Class.
-  def jobs
-    frm.link(:text=>"Jobs").click
-    JobList.new(@browser)
-  end
+  link "Jobs"
+  link "Filter Events"
 
 end
 
@@ -21,26 +19,12 @@ class JobList < BasePage
 
   frame_element
 
-  # Clicks the New Job link, then
-  # instantiates the CreateNewJob Class.
-  def new_job
-    frm.link(:text=>"New Job").click
-    CreateNewJob.new(@browser)
-  end
-
-  # Clicks the link with the text "Triggers" associated with the
-  # specified job name, 
-  # then instantiates the EditTriggers Class.
-  def triggers(job_name)
-    frm.div(:class=>"portletBody").table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(job_name)}/).link(:text=>/Triggers/).click
-    sleep 1
-    EditTriggers.new(@browser)
-  end
-
-  def event_log
-    frm.link(:text=>"Event Log").click
-    EventLog.new(@browser)
-  end
+  link "New Job"
+  link "Delete"
+  link "Event Log"
+
+  action(:triggers) { |job_name, b| b.frm.div(:class=>"portletBody").table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(job_name)}/).link(:text=>/Triggers/).click }
+  element(:check) { |job_name, b| b.frm.div(:class=>"portletBody").table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(job_name)}/).checkbox }
 
 end
 
@@ -51,13 +35,11 @@ class CreateNewJob < BasePage
 
   # Clicks the Post button, then
   # instantiates the JobList Class.
-  def post
-    frm.button(:value=>"Post").click
-    JobList.new(@browser)
-  end
+  button "Post"
 
   element(:job_name) { |b| b.frm.text_field(:id=>"_id2:job_name") }
   element(:type) { |b| b.frm.select_list(:name=>"_id2:_id10") }
+
 end
 
 # The page for Editing Triggers
@@ -67,20 +49,10 @@ class EditTriggers < BasePage
 
   # Clicks the "Run Job Now" link, then
   # instantiates the RunJobConfirmation Class.
-  def run_job_now
-    frm.div(:class=>"portletBody").link(:text=>"Run Job Now").click
-    RunJobConfirmation.new(@browser)
-  end
+  action(:run_job_now) { |b| b.frm.div(:class=>"portletBody").link(:text=>"Run Job Now").click }
 
-  def return_to_jobs
-    frm.link(:text=>"Return_to_Jobs").click
-    JobList.new(@browser)
-  end
-
-  def new_trigger
-    frm.link(:text=>"New Trigger").click
-    CreateTrigger.new(@browser)
-  end
+  link "Return_to_Jobs"
+  link "New Trigger"
 
 end
 
@@ -89,13 +61,11 @@ class CreateTrigger < BasePage
 
   frame_element
 
-  def post
-    frm.button(:value=>"Post").click
-    EditTriggers.new(@browser)
-  end
+  button "Post"
 
   element(:name) { |b| b.frm.text_field(:id=>"_id2:trigger_name") }
   element(:cron_expression) { |b| b.frm.text_field(:id=>"_id2:trigger_expression") }
+
 end
 
 
@@ -106,10 +76,7 @@ class RunJobConfirmation < BasePage
 
   # Clicks the "Run Now" button, then
   # instantiates the JobList Class.
-  def run_now
-    frm.button(:value=>"Run Now").click
-    JobList.new(@browser)
-  end
+  button "Run Now"
 
 end
 

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

@@ -46,29 +46,14 @@ class Lessons < LessonsBase
   action(:archive) { |b| b.frm.link(text: "Archive").click }
   action(:move_sections) { |b| b.frm.link(text: "Move Section(s)").click }
 
-  # Clicks on the link that matches the supplied
-  # name value, next is the
-  # AddEditLesson, or ViewLesson class, depending
-  # on which page loads.
-  #
-  # Will error out if there is no
-  # matching link in the list.
-  def open_lesson(name)
-    frm.link(:text=>name).click
-  end
-  alias open_section open_lesson
+  action(:open_lesson) { |name, b| b.frm.link(:text=>name).click }
+  alias :open_section :open_lesson
 
-  def href(name)
-    frm.link(:text=>name).href
-  end
+  action(:href) { |name, b| b.frm.link(:text=>name).href }
 
-  def check_lesson(name)
-    frm.tr(text: /#{Regexp.escape(name)}/).td(class: "ModCheckClass").checkbox.set
-  end
+  action(:check_lesson) { |name, b| b.frm.tr(text: /#{Regexp.escape(name)}/).td(class: "ModCheckClass").checkbox.set }
 
-  def check_section(name)
-    frm.td(class: "SectionClass", text: /#{Regexp.escape(name)}/).checkbox.set
-  end
+  action(:check_section) { |name, b| b.frm.td(class: "SectionClass", text: /#{Regexp.escape(name)}/).checkbox.set }
 
   # Returns an array of the Module titles displayed on the page.
   def lessons_list
@@ -108,7 +93,7 @@ class ViewModule < LessonsBase
     return list
   end
 
-  action(:next) { |b| b.frm.link(:text=>"Next").click }
+  link "Next"
 
   # Returns the text of the Module title row
   value(:module_title) { |b| b.frm.span(:id=>/modtitle/).text }
@@ -129,14 +114,10 @@ class ViewModuleList < LessonsBase
   menu_elements
 
   # LessonStudentSide
-  def open_lesson(name)
-    frm.link(:text=>name).click
-  end
+  action(:open_lesson) { |name, b| b.frm.link(:text=>name).click }
 
   # SectionStudentSide
-  def open_section(name)
-    frm.link(:text=>name).click
-  end
+  action(:open_section) { |name, b| b.frm.link(:text=>name).click }
 
 end
 
@@ -159,13 +140,9 @@ class LessonManage < LessonsBase
 
   menu_elements
 
-  action(:manage_content) {|b| b.frm.link(:text=>"Manage Content").click }
-
-  action(:sort) {|b| b.frm.link(:text=>"Sort").click }
-
-  # Clicks the Import/Export button and
-  # next is the LessonImportExport class.
-  action(:import_export) {|b| b.frm.link(:text=>"Import/Export").click }
+  link "Manage Content"
+  link "Sort"
+  link "Import/Export"
 
 end
 

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

@@ -9,11 +9,11 @@ class Matrices < BasePage
 
   # Clicks the Add link and instantiates
   # the AddEditMatrix Class.
-  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 }
+  link "Add"
+  link "Import"
+  link "Manage Site Associations"
+  link "Permissions"
+  link "My Preferences"
 
   # Clicks the "Edit" link for the specified
   # Matrix item, then instantiates the EditMatrixCells.
@@ -58,19 +58,19 @@ class AddEditMatrix < BasePage
   element(:editor) { |b| b.frm.frame(:id=>"descriptionTextArea___Frame") }
 
   # Clicks the "Create Matrix" button
-  action(:create_matrix) { |b| b.frm.button(:value=>"Create Matrix").click }
+  button "Create Matrix"
 
   # Clicks the "Save Changes" button
-  action(:save_changes) { |b| b.frm.button(:value=>"Save Changes").click }
+  button "Save Changes"
 
   # Clicks the "Select Style" link
-  action(:select_style) { |b| b.frm.link(:text=>"Select Style").click }
+  link "Select Style"
 
   # Clicks the "Add Column" link
-  action(:add_column) { |b| b.frm.link(:text=>"Add Column").click }
+  link "Add Column"
 
   # Clicks the "Add Row" link
-  action(:add_row) { |b| b.frm.link(:text=>"Add Row").click }
+  link "Add Row"
 
   element(:title) { |b| b.frm.text_field(:id=>"title-id") }
 
@@ -81,9 +81,7 @@ class SelectMatrixStyle < BasePage
 
   frame_element
 
-  # Clicks the "Go Back" button and
-  # instantiates the AddEditMatrix Class.
-  action(:go_back) { |b| b.frm.button(:value=>"Go Back").click }
+  button "Go Back"
 
   # Clicks the "Select" link for the specified
   # Style, then instantiates the AddEditMatrix Class.
@@ -96,7 +94,7 @@ class RowColumnCommon < BasePage
   frame_element
   class << self
     def table_elements
-      action(:update) { |b| b.frm.button(:value=>"Update").click }
+      button "Update"
       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") }

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

@@ -2,188 +2,19 @@ class Messages < BasePage
 
   frame_element
 
-  # Clicks the Compose Message button,
-  # then instantiates the
-  # ComposeMessage class.
-  def compose_message
-    frm.link(:text=>"Compose Message").click
-    sleep 1 #FIXME
-    ComposeMessage.new(@browser)
-  end
-
-  def received
-    frm.link(:text=>"Received").click
-    MessagesReceivedList.new(@browser)
-  end
-
-  def sent
-    frm.link(:text=>"Sent").click
-    MessagesSentList.new(@browser)
-  end
-
-  def deleted
-    frm.link(:text=>"Deleted").click
-    MessagesDeletedList.new(@browser)
-  end
-
-  def draft
-    frm.link(:text=>"Draft").click
-    MessagesDraftList.new(@browser)
-  end
-
-  def open_folder(foldername)
-    frm.link(:text=>foldername).click
-    FolderList.new(@browser)
-  end
-
-  def new_folder
-    frm.link(:text=>"New Folder").click
-    MessagesNewFolder.new(@browser)
-  end
-
-  def settings
-    frm.link(:text=>"Settings").click
-    MessagesSettings.new(@browser)
-  end
-
-  # Gets the count of messages
-  # in the specified folder
-  # and returns it as a string
-  def total_messages_in_folder(folder_name)
-    frm.table(:id=>"msgForum:_id23:0:privateForums").row(:text=>/#{Regexp.escape(folder_name)}/).span(:class=>"textPanelFooter", :index=>0).text =~ /\d+/
-    return $~.to_s
-  end
-
-  # Gets the count of unread messages
-  # in the specified folder and returns it
-  # as a string
-  def unread_messages_in_folder(folder_name)
-    frm.table(:id=>"msgForum:_id23:0:privateForums").row(:text=>/#{Regexp.escape(folder_name)}/).span(:text=>/unread/).text =~ /\d+/
-    return $~.to_s
-  end
-
-  # Gets all the folder names
-  def folders
-    links = frm.table(:class=>"hierItemBlockWrapper").links.find_all { |link| link.title != /Folder Settings/ }
-    folders = []
-    links.each { |link| folders << link.text }
-    return folders
-  end
-
-  def folder_settings(folder_name)
-    frm.table(:class=>"hierItemBlockWrapper").row(:text=>/#{Regexp.escape(folder_name)}/).link(:text=>"Folder Settings").click
-    MessageFolderSettings.new(@browser)
-  end
-end
-
-class MessagesSentList < BasePage
-
-  frame_element
-
-  # Clicks the "Messages" breadcrumb link to return
-  # to the top level of Messages. Then instantiates
-  # the Messages class.
-  def messages
-    frm.link(:text=>"Messages").click
-    Messages.new(@browser)
-  end
-
-  # Creates an array consisting of the
-  # message subject lines.
-  def subjects
-    titles = []
-    messages = frm.table(:id=>"prefs_pvt_form:pvtmsgs")
-    1.upto(messages.rows.size-1) do |x|
-      titles << messages.row(:index=>x).a.title
-    end
-    return titles
-  end
-
-  # Returns a string consisting of the content of the
-  # page header--or "breadcrumb", as it's called.
-  def header
-    frm.div(:class=>"breadCrumb specialLink").text
-  end
-
-  # Clicks the Compose Message button,
-  # then instantiates the
-  # ComposeMessage class.
-  def compose_message
-    frm.link(:text=>"Compose Message").click
-    ComposeMessage.new(@browser)
-  end
-
-  # Grabs the text from the message
-  # box that appears after doing some
-  # action.
-  #
-  # Use this method to simplify writing
-  # Test::Unit asserts
-  def alert_message_text
-    frm.span(:class=>"success").text
-  end
-
-  action(:check_all) { |b| b.frm.link(:text=>"Check All").click }
-
-end
-
-class MessagesReceivedList < BasePage
-
-  frame_element
-
-  # Returns a string consisting of the content of the
-  # page header--or "breadcrumb", as it's called.
-  def header
-    frm.div(:class=>"breadCrumb specialLink").text
-  end
-
-  # Clicks the "Messages" breadcrumb link to return
-  # to the top level of Messages. Then instantiates
-  # the Messages class.
-  def messages
-    frm.link(:text=>"Messages").click
-    Messages.new(@browser)
-  end
-
-  def compose_message
-    frm.link(:text=>"Compose Message").click
-    ComposeMessage.new(@browser)
-  end
-
-  # Clicks on the specified message subject
-  # then instantiates the MessageView class.
-  def open_message(subject)
-    frm.link(:text, /#{Regexp.escape(subject)}/).click
-    MessageView.new(@browser)
-  end
-
-  # Grabs the text from the message
-  # box that appears after doing some
-  # action.
-  #
-  # Use this method to simplify writing
-  # Test::Unit asserts
-  def alert_message_text
-    frm.span(:class=>"success").text
-  end
-
-  # Checks the checkbox for the specified
-  # message in the list.
-  #
-  # Will throw an error if the specified
-  # subject is not present.
-  def check_message(subject)
+  value(:header) { |b| b.frm.div(:class=>"breadCrumb specialLink").text }
+  value(:alert_message_text) { |b| b.frm.span(:class=>"success").text }
+  link "Compose Message"
+  link "Messages"
+  action(:open_message) { |subject, b| b.frm.link(:text, /#{Regexp.escape(subject)}/).click }
+  action(:check_message) { |subject, b|
     index=subjects.index(subject)
-    frm.checkbox(:name=>"prefs_pvt_form:pvtmsgs:#{index}:_id122").set
-  end
-
-  # Clicks the "Mark Read" link, then
-  # reinstantiates the class because
-  # the page partially refreshes.
-  def mark_read
-    frm.link(:text=>"Mark Read").click
-    MessagesReceivedList.new(@browser)
-  end
+    b.frm.checkbox(:name=>"prefs_pvt_form:pvtmsgs:#{index}:_id122").set }
+  link "Mark Read"
+  element(:view) { |b| b.frm.select(:id=>"prefs_pvt_form:viewlist") }
+  link "Check All"
+  link "Delete"
+  link "Move"
 
   # Creates an array consisting of the
   # message subject lines.
@@ -196,103 +27,44 @@ class MessagesReceivedList < BasePage
     return titles
   end
 
-  # Returns an Array object containing the
-  # subjects of the displayed messages that are
-  # marked unread.
   def unread_messages
     # TODO - Write this method
   end
 
-  # Clicks the Move link, then
-  # instantiates the MoveMessageTo Class.
-  def move
-    frm.link(:text, "Move").click
-    MoveMessageTo.new(@browser)
-  end
-
-  element(:view) { |b| b.frm.select(:id=>"prefs_pvt_form:viewlist") }
-  action(:check_all) { |b| b.frm.link(:text=>"Check All").click }
-  action(:delete) { |b| b.frm.link(:text=>"Delete").click }
-
 end
 
-# Page for the Contents of a Custom Folder for Messages
-class FolderList < BasePage
+class MessageFolders < BasePage
 
   frame_element
 
-  def compose_message
-    frm.link(:text=>"Compose Message").click
-    ComposeMessage.new(@browser)
-  end
-
-  # Clicks on the specified message subject
-  # then instantiates the MessageView class.
-  def open_message(subject)
-    frm.link(:text, /#{Regexp.escape(subject)}/).click
-    MessageView.new(@browser)
-  end
-
-  # Grabs the text from the message
-  # box that appears after doing some
-  # action.
-  #
-  # Use this method to simplify writing
-  # Test::Unit asserts
-  def alert_message_text
-    frm.span(:class=>"success").text
-  end
-
-  # Checks the checkbox for the specified
-  # message in the list.
-  #
-  # Will throw an error if the specified
-  # subject is not present.
-  def check_message(subject)
-    index=subjects.index(subject)
-    frm.checkbox(:name=>"prefs_pvt_form:pvtmsgs:#{index}:_id122").set
-  end
+  link "Received"
+  link "Sent"
+  link "Deleted"
+  link "Draft"
+  link "New Folder"
+  link "Settings"
 
-  # Clicks the Messages link in the
-  # Breadcrumb bar at the top of the
-  # page, then instantiates the Messages
-  # class
-  def messages
-    frm.link(:text=>"Messages").click
-    Messages.new(@browser)
-  end
-
-  # Clicks the "Mark Read" link, then
-  # reinstantiates the class because
-  # the page partially refreshes.
-  def mark_read
-    frm.link(:text=>"Mark Read").click
-    MessagesReceivedList.new(@browser)
-  end
+  action(:open_folder) { |foldername, b| b.frm.link(:text=>foldername).click }
 
-  # Creates an array consisting of the
-  # message subject lines.
-  def subjects
-    titles = []
-    messages = frm.table(:id=>"prefs_pvt_form:pvtmsgs")
-    1.upto(messages.rows.size-1) do |x|
-      titles << messages.row(:index=>x).a.title
-    end
-    return titles
-  end
+  # Gets the count of messages
+  # in the specified folder
+  # and returns it as a string
+  action(:total_messages_in_folder) { |folder_name, b| b.frm.table(:id=>"msgForum:_id23:0:privateForums").row(:text=>/#{Regexp.escape(folder_name)}/).span(:class=>"textPanelFooter", :index=>0).text =~ /\d+/; return $~.to_s }
 
-  def unread_messages
-    # TODO - Write this method
-  end
+  # Gets the count of unread messages
+  # in the specified folder and returns it
+  # as a string
+  action(:unread_messages_in_folder) { |folder_name, b| b.frm.table(:id=>"msgForum:_id23:0:privateForums").row(:text=>/#{Regexp.escape(folder_name)}/).span(:text=>/unread/).text =~ /\d+/; return $~.to_s }
 
-  def move
-    frm.link(:text, "Move").click
-    MoveMessageTo.new(@browser)
+  # Gets all the folder names
+  def folders
+    links = frm.table(:class=>"hierItemBlockWrapper").links.find_all { |link| link.title != /Folder Settings/ }
+    folders = []
+    links.each { |link| folders << link.text }
+    return folders
   end
 
-  element(:view) { |b| b.frm.select(:id=>"prefs_pvt_form:viewlist") }
-  action(:check_all) { |b| b.frm.link(:text=>"Check All").click }
-  action(:delete) { |b| b.frm.link(:text=>"Delete").click }
+  action(:folder_settings) { |folder_name, b| b.frm.table(:class=>"hierItemBlockWrapper").row(:text=>/#{Regexp.escape(folder_name)}/).link(:text=>"Folder Settings").click }
 
 end
 
@@ -302,18 +74,13 @@ class MoveMessageTo < BasePage
 
   frame_element
 
-  def move_messages
-    frm.button(:value=>"Move Messages").click
-    Messages.new(@browser)
-  end
+  button "Move Messages"
 
   # Method for selecting any custom folders
   # present on the screen--and *only* the custom
   # folders. Count begins with "1" for the first custom
   # folder listed.
-  def select_custom_folder_num(num)
-    frm.radio(:index=>num.to_i+3).set
-  end
+  action(:select_custom_folder_num) { |num, b| b.frm.radio(:index=>num.to_i+3).set }
 
   element(:received) { |b| b.frm.radio(:name=>"pvtMsgMove:_id16:0:privateForums:0:_id19") }
   element(:sent) { |b| b.frm.radio(:name=>"pvtMsgMove:_id16:0:privateForums:1:_id19") }
@@ -322,159 +89,43 @@ class MoveMessageTo < BasePage
 
 end
 
-# The page showing the list of deleted messages.
-class MessagesDeletedList < BasePage
-
-  frame_element
-
-  # Returns a string consisting of the content of the
-  # page header--or "breadcrumb", as it's called.
-  def header
-    frm.div(:class=>"breadCrumb specialLink").text
-  end
-
-  # Clicks the "Messages" breadcrumb link to return
-  # to the top level of Messages. Then instantiates
-  # the Messages class.
-  def messages
-    frm.link(:text=>"Messages").click
-    Messages.new(@browser)
-  end
-
-  def compose_message
-    frm.link(:text=>"Compose Message").click
-    ComposeMessage.new(@browser)
-  end
-
-  # Grabs the text from the message
-  # box that appears after doing some
-  # action.
-  #
-  # Use this method to simplify writing
-  # Test::Unit asserts
-  def alert_message_text
-    frm.span(:class=>"success").text
-  end
-
-  # Creates an array consisting of the
-  # message subject lines.
-  def subjects
-    titles = []
-    messages = frm.table(:id=>"prefs_pvt_form:pvtmsgs")
-    1.upto(messages.rows.size-1) do |x|
-      titles << messages[x][2].text
-    end
-    return titles
-  end
-
-  # Checks the checkbox for the specified
-  # message in the list.
-  #
-  # Will throw an error if the specified
-  # subject is not present.
-  def check_message(subject)
-    index=subjects.index(subject)
-    frm.checkbox(:name=>"prefs_pvt_form:pvtmsgs:#{index}:_id122").set
-  end
-
-  def move
-    frm.link(:text, "Move").click
-    MoveMessageTo.new(@browser)
-  end
-
-  def delete
-    frm.link(:text=>"Delete").click
-    MessageDeleteConfirmation.new(@browser)
-  end
-
-  action(:check_all) { |b| b.frm.link(:text=>"Check All").click }
-
-end
-
-# The page showing the list of Draft messages.
-class MessagesDraftList < BasePage
-
-  frame_element
-
-  def compose_message
-    frm.link(:text=>"Compose Message").click
-    ComposeMessage.new(@browser)
-  end
-
-  # Grabs the text from the message
-  # box that appears after doing some
-  # action.
-  #
-  # Use this method to simplify writing
-  # Test::Unit asserts
-  def alert_message_text
-    frm.span(:class=>"success").text
-  end
-
-  action(:check_all) { |b| b.frm.link(:text=>"Check All").click }
-
-end
-
 # The Page where you are reading a Message.
 class MessageView < BasePage
 
   frame_element
 
   # Returns the contents of the message body.
-  def message_text
-    frm.div(:class=>"textPanel").text
-  end
+  value(:message_text) { |b| b.frm.div(:class=>"textPanel").text }
 
-  def reply
-    frm.button(:value=>"Reply").click
-    ReplyToMessage.new(@browser)
-  end
+  button "Reply"
 
-  def forward
-    frm.button(:value=>"Forward ").click
-    ForwardMessage.new(@browser)
-  end
+  action(:forward) { |b| b.frm.button(:value=>"Forward ").click }
 
-  def received
-    frm.link(:text=>"Received").click
-    MessagesReceivedList.new(@browser)
-  end
+  link "Received"
 
   # Clicks the "Messages" breadcrumb link to return
   # to the top level of Messages. Then instantiates
   # the Messages class.
-  def messages
-    frm.link(:text=>"Messages").click
-    Messages.new(@browser)
-  end
+  link "Messages"
+
 end
 
 class ComposeMessage < BasePage
 
+  include FCKEditor
   frame_element
+  expected_element :editor
 
-  def send
-    frm.button(:value=>"Send ").click
-    Messages.new(@browser)
-  end
+  element(:editor) { |b| b.frm.frame(:id, "compose:pvt_message_body_inputRichText___Frame") }
+  action(:send) { |b| b.frm.button(:value=>"Send ").click }
 
   def message_text=(text)
-    frm.frame(:id, "compose:pvt_message_body_inputRichText___Frame").td(:id, "xEditingArea").wait_until_present
-    sleep 0.3
-    frm.frame(:id, "compose:pvt_message_body_inputRichText___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
-  end
-
-  def add_attachments
-    frm.button(:value=>"Add attachments").click
-    MessagesAttachment.new(@browser)
-  end
-
-  def preview
-    frm.button(:value=>"Preview").click
-    MessagesPreview.new(@browser)
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
-  action(:save_draft) {|b| b.frm.button(:value=>"Save Draft").click }
+  button "Add attachments"
+  button "Preview"
+  button "Save Draft"
   element(:send_to) { |b| b.frm.select(:id=>"compose:list1") }
   element(:send_cc) { |b| b.frm.checkbox(:id=>"compose:send_email_out") }
   element(:subject) { |b| b.frm.text_field(:id=>"compose:subject") }
@@ -488,34 +139,16 @@ class ReplyToMessage < BasePage
   expected_element :editor
 
   element(:editor) { |b| b.frm.frame(:id, "pvtMsgReply:df_compose_body_inputRichText___Frame") }
-
-  def send
-    frm.button(:value=>"Send ").click
-    # Need logic here to ensure the
-    # right class gets called...
-    if frm.div(:class=>/breadCrumb/).text=~ /Messages.\/.Received/
-      MessagesReceivedList.new(@browser)
-    else #FIXME
-      Messages.new(@browser)
-    end
-  end
+  action(:send) { |b| b.frm.button(:value=>"Send ").click }
 
   def message_text=(text)
     editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(:home)
     editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
-  def add_attachments
-    frm.button(:value=>"Add attachments").click
-    MessagesAttachment.new(@browser)
-  end
-
-  def preview
-    frm.button(:value=>"Preview").click
-    MessagesPreview.new(@browser)
-  end
-
-  action(:save_draft) {|b| b.frm.button(:value=>"Save Draft").click }
+  button "Add attachments"
+  button "Preview"
+  button "Save Draft"
   element(:select_additional_recipients) { |b| b.frm.select(:id=>"compose:list1") }
   element(:send_cc) { |b| b.frm.checkbox(:id=>"compose:send_email_out") }
   element(:subject) { |b| b.frm.text_field(:id=>"compose:subject") }
@@ -524,30 +157,22 @@ end
 
 # The page for composing a message
 class ForwardMessage < BasePage
-
+  include FCKEditor
   frame_element
 
-  def send
-    frm.button(:value=>"Send ").click
-    MessagesReceivedList.new(@browser) #FIXME!
-  end
-
-  def message_text=(text)
-    frm.frame(:id, "pvtMsgForward:df_compose_body_inputRichText___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(:home)
-    frm.frame(:id, "pvtMsgForward:df_compose_body_inputRichText___Frame").td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
-  end
+  expected_element :editor
 
-  def add_attachments
-    frm.button(:value=>"Add attachments").click
-    MessagesAttachment.new(@browser)
-  end
+  element(:editor) { |b| b.frm.frame(:id, "pvtMsgForward:df_compose_body_inputRichText___Frame") }
+  action(:send) { |b| b.frm.button(:value=>"Send ").click }
 
-  def preview
-    frm.button(:value=>"Preview").click
-    MessagesPreview.new(@browser)
+  def message_text=(text)
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(:home)
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(text)
   end
 
-  action(:save_draft) {|b| b.frm.button(:value=>"Save Draft").click }
+  button "Add attachments"
+  button "Preview"
+  button "Save Draft"
   element(:select_forward_recipients) { |b| b.frm.select(:id=>"pvtMsgForward:list1") }
   element(:send_cc) { |b| b.frm.checkbox(:id=>"compose:send_email_out") }
   element(:subject) { |b| b.frm.text_field(:id=>"compose:subject") }
@@ -563,10 +188,7 @@ class MessageDeleteConfirmation < BasePage
 
   value(:alert_message_text) { |b| b.frm.span(:class=>"alertMessage").text }
 
-  def delete_messages
-    frm.button(:value=>"Delete Message(s)").click
-    MessagesDeletedList.new(@browser)
-  end
+  button "Delete Message(s)"
 
   #FIXME
   # Want eventually to have a method that will return
@@ -578,10 +200,7 @@ class MessagesNewFolder < BasePage
 
   frame_element
 
-  def add
-    frm.button(:value=>"Add").click
-    Messages.new(@browser)
-  end
+  button"Add"
 
   element(:title) { |b| b.frm.text_field(:id=>"pvtMsgFolderAdd:title") }
 
@@ -592,20 +211,9 @@ class MessageFolderSettings < BasePage
 
   frame_element
 
-  def rename_folder
-    frm.button(:value=>"Rename Folder").click
-    RenameMessageFolder.new(@browser)
-  end
-
-  def add
-    frm.button(:value=>"Add").click
-    MessagesNewFolder.new(@browser)
-  end
-
-  def delete
-    frm.button(:value=>"Delete").click
-    FolderDeleteConfirm.new(@browser)
-  end
+  button "Rename Folder"
+  button "Add"
+  button "Delete"
 
 end
 
@@ -614,9 +222,6 @@ class FolderDeleteConfirm < BasePage
 
   frame_element
 
-  def delete
-    frm.button(:value=>"Delete").click
-    Messages.new(@browser)
-  end
+  button "Delete"
 
 end