sambal-cle 0.1.5 → 0.1.6

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

@@ -6,13 +6,8 @@
 class Styles < BasePage
 
   frame_element
-  
-  # Clicks the Add link and
-  # instantiates the AddStyle Class.
-  def add
-    frm.link(:text=>"Add").click
-    AddStyle.new(@browser)
-  end
+
+  link("Add")
 
 end
 
@@ -20,55 +15,15 @@ end
 class AddStyle < BasePage
 
   frame_element
-  
-  # Clicks the Add Style button and
-  # instantiates the Styles Class.
-  def add_style
-    frm.button(:value=>"Add Style").click
-    Styles.new(@browser)
-  end
-  
-  # Clicks the "Select File" link and
-  # instantiates the StylesAddAttachment Class.
-  def select_file
-    frm.link(:text=>"Select File").click
-    StylesAddAttachment.new(@browser)
-  end
+
+  button("Add Style")
+
+  link("Select File")
 
   element(:name) { |b| b.frm.text_field(:id=>"name-id") }
   element(:description) { |b| b.frm.text_field(:id=>"descriptionTextArea") }
 
 end
 
-# TODO Dry this up because there can be a superclass here
-class StylesUploadFiles < ResourcesBase
-  
-  @@filex=0
-  
-  # 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
-  
-  # Clicks the "Upload Files Now" button
-  # then instantiates the StylesAddAttachment Class.
-  def upload_files_now
-    frm.button(:value=>"Upload Files Now").click
-    sleep 0.5
-    @@filex=0
-    StylesAddAttachment.new(@browser)
-  end
-  
-  # Clicks the "Add Another File" link.
-  def add_another_file
-    frm.link(:text=>"Add Another File").click
-  end
-  
-end
-
 
 

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

@@ -10,10 +10,10 @@ class SyllabusBase < BasePage
   class << self
 
     def menu_elements
-      action(:create_edit) { |b| b.frm.link(:text=>"Create/Edit").click }
-      action(:add) { |b| b.frm.link(:text=>"Add").click }
-      action(:redirect) { |b| b.frm.link(:text=>"Redirect").click }
-      action(:preview) { |b| b.frm.link(text: "Preview").click }
+      link("Create/Edit")
+      link("Add")
+      link("Redirect")
+      link("Preview")
     end
 
   end
@@ -59,12 +59,10 @@ class SyllabusEdit < SyllabusBase
     #FIXME
   end
 
-  action(:update) { |b| b.frm.button(:value=>"Update").click }
+  button("Update")
 
   # Opens the specified item
-  def open_item(title)
-    frm.link(:text=>title).click
-  end
+  action(:open_item) { | title, b| b.frm.link(:text=>title).click }
 
   # Returns an array containing the titles of the syllabus items
   # displayed on the page.
@@ -87,24 +85,18 @@ class AddEditSyllabusItem < SyllabusBase
 
   expected_element :editor
 
-  # Clicks the "Post" button and instantiates
-  # the Syllabus Class.
-  action(:post) { |b| b.frm.button(:value=>"Post").click }
+  button("Post")
 
   # Defines the text area of the FCKEditor that appears on the page for
   # the Syllabus content.
-  def editor
-    frm.frame(:id=>/_textarea___Frame/)
-  end
+  element(:editor) { |b| b.frm.frame(:id=>/_textarea___Frame/) }
 
   # Sends the specified string to the FCKEditor text area on the page.
   def content=(text)
     editor.send_keys(text)
   end
 
-  # Clicks the Add attachments button and instantiates the
-  # SyllabusAttach class.
-  action(:add_attachments) { |b| frm.button(:value=>"Add attachments").click }
+  button("Add attachments")
 
   # Returns an array of the filenames in the attachments
   # table
@@ -118,12 +110,7 @@ class AddEditSyllabusItem < SyllabusBase
     return names
   end
 
-  # Clicks the preview button and
-  # instantiates the SyllabusPreview class
-  def preview
-    frm.button(:value=>"Preview").click
-    SyllabusPreview.new(@browser)
-  end
+  button("Preview")
 
   element(:title) { |b| b.frm.text_field(:id=>"_id4:title") }
   element(:only_members_of_this_site) { |b| b.frm.radio_button(:name=>/_id\d+:_id\d+/, :value=>"no") }
@@ -136,7 +123,7 @@ class SyllabusPreview < SyllabusBase
 
   menu_elements
 
-  action(:edit) { |b| b.frm.button(:value=>"Edit").click }
+  button("Edit")
 
 end
 
@@ -145,7 +132,6 @@ class SyllabusRedirect < SyllabusBase
 
   menu_elements
 
-  action(:save) { |b| b.frm.button(:value=>"Save").click }
   element(:url) { |b| b.frm.text_field(:id=>"redirectForm:urlValue") }
 
 end
@@ -155,7 +141,7 @@ class DeleteSyllabusItems < SyllabusBase
 
   menu_elements
 
-  action(:delete) { |b| b.frm.button(:value=>"Delete").click }
+  button("Delete")
 
 end
 

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

@@ -17,25 +17,13 @@ class UserMembership < BasePage
     return names
   end
 
-  # Returns the user id of the specified user (assuming that person
-  # appears in the search results list, otherwise this method will
-  # throw an error.)
-  def user_id(name)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(name)}/)[0].text
-  end
+  action(:user_id) { |name, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(name)}/)[0].text }
 
-  # Returns the user type of the specified user (assuming that person
-  # appears in the search results list, otherwise this method will
-  # throw an error.)
-  def type(name)
-    frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(name)}/)[4].text
-  end
+  action(:type) { |name, b| b.frm.table(:class=>/listHier/).row(:text=>/#{Regexp.escape(name)}/)[4].text }
 
   # Returns the text contents of the "instruction" paragraph that
   # appears when there are no search results.
-  def alert_text
-    frm.p(:class=>"instruction").text
-  end
+  value(:alert_text) { |b| b.frm.p(:class=>"instruction").text }
 
   element(:user_type) { |b| b.frm.select_list(:id=>"userlistForm:selectType") }
   element(:user_authority) { |b| b.frm.select_list(:id=>"userlistForm:selectAuthority") }

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

@@ -9,10 +9,10 @@ class EditUser < BasePage
 
   def update_details
     frm.button(:name=>"eventSubmit_doSave").click
-    sleep 1
+    frm.link(:text=>"Search").wait_until_present
   end
 
-  action(:remove_user) { |b| b.frm.link(text=>"Remove User").click }
+  link "Remove User"
   element(:first_name) { |b| b.frm.text_field(:id=>"first-name") }
   element(:last_name) { |b| b.frm.text_field(:id=>"last-name") }
   element(:email) { |b| b.frm.text_field(:id=>"email") }
@@ -27,36 +27,23 @@ class Users < BasePage
 
   frame_element
 
-  def new_user
-    frm.link(:text=>"New User").click
-    CreateNewUser.new @browser
-  end
+  link "New User"
 
   # Returns the contents of the Name cell
   # based on the specified user ID value.
-  def name(user_id)
-    frm.table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(user_id)}/i)[1].text
-  end
+  action(:name) { |user_id, b| b.frm.table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(user_id)}/i)[1].text }
 
   # Returns the contents of the Email cell
   # based on the specified user ID value.
-  def email(user_id)
-    frm.table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(user_id)}/i)[2].text
-  end
+  action(:email) { |user_id, b| b.frm.table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(user_id)}/i)[2].text }
 
   # Returns the contents of the Type cell
   # based on the specified user ID value.
-  def type(user_id)
-    frm.table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(user_id)}/i)[3].text
-  end
+  action(:type) { |user_id, b| b.frm.table(:class=>"listHier lines").row(:text=>/#{Regexp.escape(user_id)}/i)[3].text }
 
-  def search_button
-    frm.link(:text=>"Search").click
-    frm.table(:class=>"listHier lines").wait_until_present
-    Users.new @browser
-  end
+  action(:search_button) { |b| b.frm.link(:text=>"Search").click; b.frm.table(:class=>"listHier lines").wait_until_present }
 
-  action(:clear_search) { |b| b.frm.link(text=>"Clear Search").click }
+  link "Clear Search"
   element(:search_field) { |b| b.frm.text_field(:id=>"search") }
   element(:select_page_size) { |b| b.frm.select_list(:name=>"selectPageSize") }
   action(:next) { |b| b.frm.button(:name=>"eventSubmit_doList_next").click }
@@ -72,10 +59,7 @@ class CreateNewUser < BasePage
 
   frame_element
 
-  def save_details
-    frm.button(:name=>"eventSubmit_doSave").click
-    Users.new(@browser)
-  end
+  action(:save_details) { |b| b.frm.button(:name=>"eventSubmit_doSave").click }
 
   element(:user_id) { |b| b.frm.text_field(:id=>"eid") }
   element(:first_name) { |b| b.frm.text_field(:id=>"first-name") }

data/sambal-cle.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'sambal-cle'
-  s.version = '0.1.5'
+  s.version = '0.1.6'
   s.summary = %q{rSmart's test framework for testing Sakai-CLE}
   s.description = %q{This gem is used for creating test scripts for the Sakai Collaborative Learning Environment.}
   s.files = Dir.glob("**/**/**")

data/test/add_assignment_to_calendar_spec.rb

@@ -80,6 +80,60 @@ describe "Assignment Due Date on Calendar" do
     end
   end
 
-  # TODO: Add tests for student and other instructor being able to see the assignment in the calendar
+  it "Students see expected assignments on the calendar" do
+    @student.log_in
+    calendar
+    on Calendar do |calendar|
+      calendar.view.select "List of Events"
+      calendar.show_events.select "Custom date range"
+      calendar.start_month.select @assignment1.due[:MON]
+      calendar.start_day.select @assignment1.due[:day_of_month]
+      calendar.start_year.select @assignment1.due[:year]
+      calendar.end_month.select @assignment1.due[:MON]
+      calendar.end_day.select @assignment1.due[:day_of_month]
+      calendar.end_year.select @assignment1.due[:year]
+      calendar.filter_events
+
+      calendar.events_list.should_not include "Due #{@assignment1.title}"
+
+      calendar.start_month.select @assignment2.due[:MON]
+      calendar.start_day.select @assignment2.due[:day_of_month]
+      calendar.start_year.select @assignment2.due[:year]
+      calendar.end_month.select @assignment2.due[:MON]
+      calendar.end_day.select @assignment2.due[:day_of_month]
+      calendar.end_year.select @assignment2.due[:year]
+      calendar.filter_events
+
+      calendar.events_list.should include "Due #{@assignment2.title}"
+    end
+  end
+
+  it "Other instructors see expected assignments on the calendar" do
+    @instructor2.log_in
+    calendar
+    on Calendar do |calendar|
+      calendar.view.select "List of Events"
+      calendar.show_events.select "Custom date range"
+      calendar.start_month.select @assignment1.due[:MON]
+      calendar.start_day.select @assignment1.due[:day_of_month]
+      calendar.start_year.select @assignment1.due[:year]
+      calendar.end_month.select @assignment1.due[:MON]
+      calendar.end_day.select @assignment1.due[:day_of_month]
+      calendar.end_year.select @assignment1.due[:year]
+      calendar.filter_events
+
+      calendar.events_list.should_not include "Due #{@assignment1.title}"
+
+      calendar.start_month.select @assignment2.due[:MON]
+      calendar.start_day.select @assignment2.due[:day_of_month]
+      calendar.start_year.select @assignment2.due[:year]
+      calendar.end_month.select @assignment2.due[:MON]
+      calendar.end_day.select @assignment2.due[:day_of_month]
+      calendar.end_year.select @assignment2.due[:year]
+      calendar.filter_events
+
+      calendar.events_list.should include "Due #{@assignment2.title}"
+    end
+  end
 
 end

data/test/config.yml

@@ -1,3 +1,3 @@
 browser: :firefox
 url: https://cle-1.qa.rsmart.com/xsl-portal
-data_directory: /Users/abrahamheward/work/Sambal/data/sakai-cle/
+data_directory: /Users/abrahamheward/Documents/data/

data/test/duplicate_site_spec.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 describe "Duplicate Site" do
 
-  include Utilities
+  include StringFactory
   include Workflows
   include Foundry
 
@@ -15,14 +15,15 @@ describe "Duplicate Site" do
     @directory = YAML.load_file("directory.yml")
     @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
-    # This test case uses the logins of several users
-    @instructor = @directory['person3']['id']
-    @ipassword = @directory['person3']['password']
+
+    @instructor = make UserObject, :id=>@directory['person3']['id'], :password=>@directory['person3']['password'],
+                       :first_name=>@directory['person3']['firstname'], :last_name=>@directory['person3']['lastname'],
+                       :type=>"Instructor"
     @file_path = @config['data_directory']
     @source_site_string = "Links to various items in this site:"
 
     # Log in to Sakai
-    @sakai.page.login(@instructor, @ipassword)
+    @instructor.login
 
     @site1 = make CourseSiteObject, :description=>"Original Site"
     @site1.create
@@ -47,7 +48,7 @@ describe "Duplicate Site" do
     @file = make FileObject, :site=>@site1.name, :name=>"flower02.jpg", :source_path=>@file_path+"images/"
     @file.create
 
-    @source_site_string << "<br />\nUploaded file: <a href=\"#{@file.href}\">#{@file.name}</a><br />\n"
+    @source_site_string << %|<br />\nUploaded file: <a href="#{@file.href}">#{@file.name}</a><br />\n<img width="203" height="196" src="https://#{$base_url}/access/content/group/#{@site1.id}/#{@file.name}" alt="" /><br /><br />|
 
     @htmlpage = make HTMLPageObject, :site=>@site1.name, :folder=>"#{@site1.name} Resources", :html=>@source_site_string
     @htmlpage.create
@@ -136,15 +137,16 @@ describe "Duplicate Site" do
     @new_assignment.get_info
 
   end
-=begin
+
   after :all do
     # Close the browser window
     @browser.close
   end
-=end
+
   def check_this_stuff(thing)
     thing.should match /Site ID: #{@site2.id}/
     thing.should match /\(y\) <a href..#{@new_assignment.direct_url}/
+    thing.should match /<img.+#{@site2.id}\/#{@file.name}/
     thing.should_not match /Announcement link:.+#{@announcement.id}.+#{@announcement.title}/
     thing.should match /Uploaded file:.+#{@site2.id}.+#{@file.name}/
     thing.should match /#{@site2.id}\/#{@htmlpage.name}/
@@ -166,7 +168,6 @@ describe "Duplicate Site" do
   end
 
   it "duplicates Assignments correctly" do
-
     check_this_stuff(@new_assignment.instructions)
   end
 
@@ -197,7 +198,7 @@ describe "Duplicate Site" do
     check_this_stuff(@new_topic.description_html)
   end
 
-  xit "duplicates Lessons correctly" do
+  it "duplicates Lessons correctly" do
     lessons
     on Lessons do |lessons|
       lessons.lessons_list.should include @module.title

data/test/import_site_content_spec.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 describe "Import Site" do
   
-  include Utilities
+  include StringFactory
   include Workflows
   include Foundry
 
@@ -16,14 +16,15 @@ describe "Import Site" do
     @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
     # This test case uses the logins of several users
-    @instructor = @directory['person3']['id']
-    @ipassword = @directory['person3']['password']
+    @instructor = make UserObject, :id=>@directory['person3']['id'], :password=>@directory['person3']['password'],
+                                     :first_name=>@directory['person3']['firstname'], :last_name=>@directory['person3']['lastname'],
+                                     :type=>"Instructor"
 
     @file_path = @config['data_directory']
     @source_site_string = "Links to various items in this site:"
 
     # Log in to Sakai
-    @sakai.page.login(@instructor, @ipassword)
+    @instructor.login
 
     @site1 = make CourseSiteObject, :description=>"Original Site"
     @site1.create
@@ -199,7 +200,7 @@ describe "Import Site" do
     check_this_stuff(@new_topic.description_html)
   end
 
-  xit "imports Lessons correctly" do
+  it "imports Lessons correctly" do
     lessons
     on Lessons do |lessons|
       lessons.lessons_list.should include @module.title