sambal-cle 0.1.5 → 0.1.6

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gem 'rspec'
-gem 'test-factory'
-gem 'watir-webdriver'
-
-gemspec
+gem "rspec"
+gem "test-factory", ">=0.0.7"
+gem "watir-webdriver", ">=0.6.0"

data/Gemfile.lock

@@ -1,9 +1,3 @@
-PATH
-  remote: .
-  specs:
-    sambal-cle (0.1.5)
-      test-factory (>= 0.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -24,6 +18,9 @@ GEM
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     rubyzip (0.9.7)
+    sambal-cle (0.1.3)
+      selenium-webdriver (>= 2.21.2)
+      watir-webdriver (>= 0.5.5)
     selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
@@ -39,6 +36,6 @@ PLATFORMS
 
 DEPENDENCIES
   rspec
-  sambal-cle!
-  test-factory
-  watir-webdriver
+  sambal-cle
+  test-factory (>= 0.0.2)
+  watir-webdriver (>= 0.6.0)

data/lib/sambal-cle/base_page.rb

@@ -11,11 +11,29 @@ class BasePage < PageFactory
       value(:alert_box) { |b| b.frm.div(:class=>"alertMessage").text }
       # Returns the text of the header.
       value(:header) { |b| b.frm.div(:class=>"portletBody").h3.text }
-      element(:cancel_button) { |b| b.frm.button(:value=>"Cancel") }
-      action(:cancel) { |p| p.cancel_button.click }
+      button("Cancel")
+      button("Save")
+      button("Back")
     end
 
-    # More element group defs go here...
+    def link(link_text)
+      element(damballa(link_text+"_link")) { |b| b.frm.link(:text=>link_text) }
+      action(damballa(link_text)) { |b| b.frm.link(:text=>link_text).click }
+    end
+
+    def button(button_text)
+      element(damballa(button_text+"_button")) { |b| b.frm.button(:value=>button_text) }
+      action(damballa(button_text)) { |b| b.frm.button(:value=>button_text).click }
+    end
+
+    def damballa(text)
+      text.gsub(/([+=|\\\.~@#'"\?`!\{\}\[\]\$%\^&\*\(\)])/, "").
+          gsub(/([-\/\ ])/,"_").
+          downcase.
+          to_sym
+    end
+
+    # Any additional needed element group defs go here...
 
   end
 

data/lib/sambal-cle/data_objects/announcement.rb

@@ -25,7 +25,7 @@ class AnnouncementObject
   alias :name :title
 
   def create
-    open_my_site_by_name
+    open_my_site_by_name @site
     announcements
     on_page Announcements do |page|
       page.add

data/lib/sambal-cle/data_objects/assignment.rb

@@ -115,8 +115,9 @@ class AssignmentObject
         edit.enter_source_text edit.editor, opts[:instructions]
       end
       edit.grade_scale.fit opts[:grade_scale]
-      edit.max_points.fit opts[:max_points]
-
+      #if edit.max_points.enabled?
+        edit.max_points.fit opts[:max_points]
+      #end
       #TODO: All the rest goes here
 
       # This should be one of the last items edited...

data/lib/sambal-cle/data_objects/course.rb

@@ -6,7 +6,7 @@ class CourseSiteObject
   include DateFactory
   include Workflows
 
-  attr_accessor :name, :id, :subject, :course, :section, :term, :authorizer,
+  attr_accessor :name, :id, :subject, :course, :section, :term, :term_value, :authorizer,
     :web_content_source, :email, :joiner_role, :creation_date, :web_content_title,
     :description, :short_description, :site_contact_name, :site_contact_email, :participants
 
@@ -42,7 +42,8 @@ class CourseSiteObject
       page.course_site.set
       # Store the selected term value for use later
       # TODO: Add logic here in case we want to actually SET the term value instead.
-      @term = page.academic_term.value
+      @term_value = page.academic_term.value
+      @term = page.academic_term.selected_options[0].text
 
       page.continue
     end
@@ -55,7 +56,7 @@ class CourseSiteObject
       page.section.set @section
 
       # Store site name for ease of coding and readability later
-      @name = "#{@subject} #{@course} #{@section} #{@term}"
+      @name = "#{@subject} #{@course} #{@section} #{@term_value}"
       # Add a valid instructor id
       page.authorizers_username.set @authorizer
 
@@ -131,7 +132,7 @@ class CourseSiteObject
       course_section.section.set @section
 
       # Store site name for ease of coding and readability later
-      @name = "#{@subject} #{@course} #{@section} #{@term}"
+      @name = "#{@subject} #{@course} #{@section} #{@term_value}"
 
       # Add a valid instructor id
       course_section.authorizers_username.set @authorizer

data/lib/sambal-cle/data_objects/event.rb

@@ -15,13 +15,13 @@ class EventObject
 
     defaults = {
         :title=>random_alphanums,
-        :month=>in_15_minutes[:month_str],
-        :day=>in_15_minutes[:day],
-        :year=>in_15_minutes[:year],
-        :start_hour=>in_15_minutes[:hour],
-        :start_minute=>in_15_minutes[:minute],
-        :start_meridian=>in_15_minutes[:meridian],
-        :message=>random_multiline(400,20, :alpha)
+        :month=>minutes_from_now(15)[:MON],
+        :day=>minutes_from_now(15)[:day_of_month],
+        :year=>minutes_from_now(15)[:year],
+        :start_hour=>minutes_from_now(15)[:hour],
+        :start_minute=>minutes_from_now(15)[:minute_rounded],
+        :start_meridian=>minutes_from_now(15)[:meridian],
+        :message=>random_multiline(400, 20, :lorem)
     }
     options = defaults.merge(opts)
 

data/lib/sambal-cle/data_objects/forum.rb

@@ -24,7 +24,7 @@ class ForumObject
   alias :name :title
 
   def create
-    open_my_site_by_name
+    open_my_site_by_name @site
     forums
     on Forums do |forums|
       forums.new_forum
@@ -98,7 +98,8 @@ end
 class TopicObject
 
   include Foundry
-  include Utilities
+  include DataFactory
+  include StringFactory
   include Workflows
   
   attr_accessor :title, :short_description, :description, :site, :forum,

data/lib/sambal-cle/data_objects/lesson.rb

@@ -2,6 +2,7 @@ class ModuleObject
 
   include Foundry
   include DataFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :title, :description, :keywords, :start_date, :end_date, :site, :href
@@ -49,6 +50,7 @@ class ContentSectionObject
 
   include Foundry
   include DataFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :site, :module, :title, :instructions, :modality, :content_type,
@@ -116,7 +118,7 @@ class ContentSectionObject
           page.url_description.set @url_description
         when "Upload or link to a file in Resources"
           page.select_or_upload_file
-          on_page ResourcesBase do |add|
+          on_page Resources do |add|
             add.open_folder @file_folder unless @file_folder == nil
             add.select_file @file_name
             add.continue

data/lib/sambal-cle/data_objects/resource.rb

@@ -22,7 +22,7 @@ class FileObject
     open_my_site_by_name @site
     resources
     on Resources do |file|
-      file.upload_file_to_folder @target_folder
+      file.upload_files_to_folder @target_folder
     end
     on ResourcesUploadFiles do |upload|
       upload.file_to_upload @name, @source_path
@@ -39,6 +39,7 @@ class FolderObject
   include Foundry
   include DataFactory
   include Workflows
+  include StringFactory
 
   attr_accessor :name, :parent_folder, :site
 
@@ -94,6 +95,7 @@ class HTMLPageObject
 
   include Foundry
   include DataFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :name, :description, :site, :folder, :html, :url

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

@@ -7,23 +7,7 @@ class EditAccount < BasePage
 
   frame_element
 
-  # Clicks the update details button then
-  # makes sure there isn't any error message present.
-  # If there is, it reinstantiates the Edit Account Class,
-  # otherwise it instantiates the UserAccount Class.
-  def update_details
-    frm.button(:value=>"Update Details").click
-    # Need to check if the update took...
-    if frm.div(:class=>"portletBody").h3.text=="My Account Details"
-      # Apparently it did...
-      UserAccount.new(@browser)
-    elsif frm.div(:class=>"portletBody").h3.text=="Account Details"
-      # We are on the edit page (or we're using the Admin account)...
-      EditAccount.new(@browser)
-    elsif frm.div(:class=>"portletBody").h3.text=="Users"
-      Users.new(@browser)
-    end
-  end
+  button("Update Details")
 
   element(:first_name) { |b| b.frm.text_field(:id=>"first-name") }
   element(:last_name) { |b| b.frm.text_field(:id=>"last-name") }
@@ -31,79 +15,44 @@ class EditAccount < BasePage
   element(:current_password) { |b| b.frm.text_field(:id=>"pwcur") }
   element(:create_new_password) { |b| b.frm.text_field(:id=>"pw") }
   element(:verify_new_password) { |b| b.frm.text_field(:id=>"pw0") }
-end
 
+end
 
 # A Non-Admin User's Account page
-# Accessible via the "Account" link in "MY SETTINGS"
-#
-# IMPORTANT: this class does not use PageObject or the ToolsMenu!!
-# So, the only available method to navigate away from this page is
-# Home. Otherwise, you'll have to call the navigation link
-# Explicitly in the test case itself.
-#
-# Objects and methods used in this class must be explicitly
-# defined using Watir and Ruby code.
-#
-# Do NOT use the PageObject syntax in this class.
 class UserAccount < BasePage
 
-  frame_element
+  def frm
+    self.frame(:index=>0) #TODO: Test that this really is needed instead of the frame_element
+  end
 
   # Clicks the Modify Details button. Instantiates the EditAccount class.
-  def modify_details
-    @browser.frame(:index=>0).button(:name=>"eventSubmit_doModify").click
-  end
+  action(:modify_details) {|b| b.frm.button(:name=>"eventSubmit_doModify").click }
 
   # Gets the text of the User ID field.
-  def user_id
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>0)[0][1].text
-  end
+  value(:user_id) { |b| b.frm.table(:class=>"itemSummary", :index=>0)[0][1].text }
 
   # Gets the text of the First Name field.
-  def first_name
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>0)[1][1].text
-  end
+  value(:first_name) {|b| b.frm.table(:class=>"itemSummary", :index=>0)[1][1].text }
 
   # Gets the text of the Last Name field.
-  def last_name
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>0)[2][1].text
-  end
+  value(:last_name) {|b| b.frm.table(:class=>"itemSummary", :index=>0)[2][1].text }
 
   # Gets the text of the Email field.
-  def email
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>0)[3][1].text
-  end
+  value(:email) {|b| b.frm.table(:class=>"itemSummary", :index=>0)[3][1].text }
 
   # Gets the text of the Type field.
-  def type
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>0)[4][1].text
-  end
+  value(:type) {|b| b.frm.table(:class=>"itemSummary", :index=>0)[4][1].text }
 
   # Gets the text of the Created By field.
-  def created_by
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>1)[0][1].text
-  end
+  value(:created_by) {|b| b.frm.table(:class=>"itemSummary", :index=>1)[0][1].text }
 
   # Gets the text of the Created field.
-  def created
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>1)[1][1].text
-  end
+  value(:created) {|b| b.frm.table(:class=>"itemSummary", :index=>1)[1][1].text }
 
   # Gets the text of the Modified By field.
-  def modified_by
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>1)[2][1].text
-  end
+  value(:modified_by) {|b| b.frm.table(:class=>"itemSummary", :index=>1)[2][1].text }
 
   # Gets the text of the Modified (date) field.
-  def modified
-    @browser.frame(:index=>0).table(:class=>"itemSummary", :index=>1)[3][1].text
-  end
-
-  # Clicks the Home buton in the left menu.
-  # instantiates the Home Class.
-  def home
-    @browser.link(:text, "Home").click
-  end
+  value(:modified) {|b| b.frm.table(:class=>"itemSummary", :index=>1)[3][1].text }
 
 end

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

@@ -12,7 +12,7 @@ class Aliases < BasePage
   action(:last) { |b| b.frm.button(:name=>"eventSubmit_doList_last").click }
   action(:previous) { |b| b.frm.button(name=>"eventSubmit_doList_prev").click }
   action(:first) { |b| b.frm.button(:name=>"eventSubmit_doList_first").click }
-  action(:new_alias) { |b| b.frm.link(:text=>"New Alias").click }
+  link("New Alias")
   action(:search_button) { |b| b.frm.button(:text=>"Search").click }
   element(:select_page_size) { |b| b.frm.select(:id=>"selectPageSize") }
 
@@ -35,7 +35,8 @@ class EditAlias < BasePage
 
   frame_element
 
-  action(:remove_alias) { |b| b.frm.link(:text=>"Remove Alias").click }
+  link("Remove Alias")
+
   element(:target) { |b| b.frm.text_field(:id=>"target") }
   action(:save) { |b| b.frm.button(:name=>"eventSubmit_doSave").click }
   action(:cancel) { |b| b.frm.button(:name=>"eventSubmit_doCancel").click }

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

@@ -8,13 +8,9 @@ class Announcements < BasePage
 
   # Edits the specified announcement in the list.
   # @param subject [String] the text of the announcement listing link.
-  def edit(subject)
-    frm.table(:class=>"listHier").row(:text=>/#{Regexp.escape(subject)}/).link(:text=>"Edit").click
-  end
+  action(:edit) { |subject, b| b.frm.table(:class=>"listHier").row(:text=>/#{Regexp.escape(subject)}/).link(:text=>"Edit").click }
 
-  def view(title)
-    frm.link(:text=>title).click
-  end
+  action(:view) { |title, b| b.frm.link(:text=>title).click }
 
   # Returns an array of the subject strings of the announcements
   # listed on the page.
@@ -25,9 +21,7 @@ class Announcements < BasePage
     return subjects
   end
 
-  def href(subject)
-    frm.link(:text=>subject).href
-  end
+  action(:href) { |subject, b| b.frm.link(:text=>subject).href }
 
   # Returns true or false depending on whether the specified announcement has an attachment.
   # @param subject [String] the text of the announcement listing link.
@@ -43,15 +37,11 @@ class Announcements < BasePage
   # Returns the text of the "For" column for
   # the specified announcement.
   # @param subject [String] the text of the announcement listing link.
-  def for_column(subject)
-    frm.table(:class=>"listHier").row(:text=>/#{Regexp.escape(subject)}/)[4].text
-  end
+  action(:for_column) { |subject, b| b.frm.table(:class=>"listHier").row(:text=>/#{Regexp.escape(subject)}/)[4].text }
 
   # Clicks the specified announcement link and instantiates the PreviewAnnouncements class.
   # @param subject [String] the text of the announcement listing link.
-  def preview_announcement(subject)
-    frm.link(:text=>subject).click
-  end
+  action(:preview_announcement) { |subject, b| b.frm.link(:text=>subject).click }
 
   # Selects the specified list item from the View selection list.
   # @param list_item [String] the text of the option in the selection list.
@@ -60,7 +50,7 @@ class Announcements < BasePage
   end
 
   # Clicks the Merge link and goes to the AnnouncementsMerge class.
-  action(:merge) { |b| b.frm.link(:text=>"Merge").click }
+  link("Merge")
 
 end
 
@@ -72,12 +62,10 @@ class AnnouncementsMerge < BasePage
 
   # Checks the checkbox for the specified site name
   # @param site_name [String] the name of the relevant site displayed in the table
-  def check(site_name)
-    frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(site_name)}/).checkbox(:id=>/site/).set
-  end
+  action(:check) { |site_name, b| b.frm.table(:class=>"listHier lines nolines").row(:text=>/#{Regexp.escape(site_name)}/).checkbox(:id=>/site/).set }
 
   # Clicks the Save button and goes to the Announcements class.
-  action(:save) { |b| b.frm.button(:value=>"Save").click }
+  button("Save")
 
 end
 
@@ -88,13 +76,13 @@ class ViewAnnouncement < BasePage
   frame_element
 
   # Clicks the Return to list button and goes to the Announcements class.
-  action(:return_to_list) { |b| b.frm.button(:value=>"Return to List").click }
+  button("Return to List")
 
   # Clicks the Save changes button and goes to the Announcements class.
-  action(:save_changes) { |b| b.frm.button(:value=>"Save Changes").click }
+  button("Save Changes")
 
   # Clicks the Edit button and goes to the AddEditAnnouncements class.
-  action(:edit) { |b| b.frm.button(:value=>"Edit").click }
+  button("Edit")
 
   value(:subject) { |b| b.frm.table(class: "itemSummary")[0][1].text }
   value(:saved_by) { |b| b.frm.table(class: "itemSummary")[1][1].text }
@@ -117,14 +105,13 @@ class AddEditAnnouncements < BasePage
 
   # Clicks the Add Announcement button. The next class is either
   # AddEditAnnouncements or Announcements.
-  action(:add_announcement) { |b| b.frm.button(:value=>"Add Announcement").click }
+  button("Add Announcement")
 
   # Clicks the Save changes button. Next is the Announcements class.
-  action(:save_changes) { |b| b.frm.button(:value=>"Save Changes").click }
+  button("Save Changes")
 
   # Clicks the Preview button. Next is the PreviewAnnouncements class.
-  action(:preview){ |b| b.frm.button(:value=>"Preview").click }
-
+  button("Preview")
 
   # Sends the specified text block to the rich text editor
   # @param text [String] the text that you want to add to the editor.
@@ -133,15 +120,13 @@ class AddEditAnnouncements < BasePage
   end
 
   # Clicks the Add attachments button. Next is the Announcments Attach class.
-  action(:add_attachments) { |b| b.frm.button(:value=>"Add Attachments").click }
+  button("Add Attachments")
 
   # Clicks the checkbox for the specified group name
   # when you've set the announcement access to display
   # to groups.
   # @param group_name [String] the name of the group in the table that you intend to select.
-  def check_group(group_name)
-    frm.table(:id=>"groupTable").row(:text=>/#{Regexp.escape(group_name)}/).checkbox(:name=>"selectedGroups").set
-  end
+  action(:check_group) { |group_name, b| b.frm.table(:id=>"groupTable").row(:text=>/#{Regexp.escape(group_name)}/).checkbox(:name=>"selectedGroups").set }
 
   element(:title) { |b| b.frm.text_field(:id=>"subject") }
   element(:site_members) { |b| b.frm.radio(:id=>"site") }