sambal-cle 0.1.3 → 0.1.4

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

@@ -5,24 +5,18 @@
 # This is the page where users log in to the site.
 class Login < BasePage
 
-  frame_element
+  page_url $base_url
 
-  def search_public_courses_and_projects
-    @browser.frame(:index=>0).link(:text=>"Search Public Courses and Projects").click
-    SearchPublic.new(@browser)
-  end
+  action(:search_public_courses_and_projects) { |b| b.frame(:index=>0).link(:text=>"Search Public Courses and Projects").click }
 
   # Logs in to Sakai using the
   # specified credentials. Then it
   # instantiates the MyWorkspace class.
-  def login(username, password)
+  def login_with username, password
     frame = @browser.frame(:id, "ifrm")
     frame.text_field(:id, "eid").set username
     frame.text_field(:id, "pw").set password
     frame.form(:method, "post").submit
-    return MyWorkspace.new(@browser)
   end
-  alias log_in login
-  alias sign_in login
 
 end

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

@@ -202,7 +202,6 @@ class SectionsOptions < SectionsBase
   element(:students_can_switch) { |b| b.frm.checkbox(:id=>"optionsForm:selfSwitch") }
 
   action(:update) { |b| b.frm.button(:id=>"optionsForm:_idJsp50").click }
-  action(:cancel) { |b| b.frm.button(:id=>"optionsForm:_idJsp51").click }
 
 end
 
@@ -213,7 +212,7 @@ class AddSections < SectionsBase
 
   element(:num_to_add) { |b| b.frm.select_list(:id=>"addSectionsForm:numToAdd") }
   element(:category) { |b| b.frm.select_list(:id=>"addSectionsForm:category") }
-  action(:cancel) { |b| b.frm.button(:id=>"addSectionsForm:_idJsp90").click }
+  #action(:cancel) { |b| b.frm.button(:id=>"addSectionsForm:_idJsp90").click }
   # Note that the following field definitions are appropriate for
   # ONLY THE FIRST instance of each of the fields. The Add Sections page
   # allows for an arbitrary number of these fields to exist.
@@ -249,7 +248,7 @@ class EditSections < SectionsBase
 
   element(:num_to_add) { |b| b.frm.select_list(:id=>"editSectionsForm:numToAdd") }
   element(:category) { |b| b.frm.select_list(:id=>"editSectionsForm:category") }
-  action(:cancel) { |b| b.frm.button(:id=>"editSectionsForm:_idJsp90").click }
+  #action(:cancel) { |b| b.frm.button(:id=>"editSectionsForm:_idJsp90").click }
   # Note that the following field definitions are appropriate for
   # ONLY THE FIRST instance of each of the fields. The Edit Sections page
   # allows for an arbitrary number of these fields to exist.

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

@@ -136,7 +136,6 @@ class Groups < SiteSetupBase
   action(:create_new_group) { |p| p.create_new_group_link.click }
   action(:auto_groups) { |b| b.frm.link(:text=>"Auto Groups").click }
   action(:remove_checked) { |b| b.frm.button(:id=>"delete-groups").click }
-  action(:cancel) { |b| b.frm.button(:id=>"cancel").click }
 
   end
 
@@ -156,7 +155,6 @@ class CreateNewGroup < SiteSetupBase
   action(:left) { |b| b.frm.button(:name=>"left", :index=>0).click }
   action(:all_right) { |b| b.frm.button(:name=>"right", :index=>1).click }
   action(:all_left) { |b| b.frm.button(:name=>"left",:index=>1).click }
-  action(:cancel) { |b| b.frm.button(:id=>"cancel").click }
 
   end
 
@@ -192,7 +190,7 @@ class SiteSetupAddParticipants < SiteSetupBase
   element(:assign_each_individually) { |b| b.frm.radio(:id=>"content::role-row:1:role-select") }
   element(:active_status) { |b| b.frm.radio(:id=>"content::status-row:0:status-select") }
   element(:inactive_status) { |b| b.frm.radio(:id=>"content::status-row:1:status-select") }
-  action(:cancel) { |b| b.frm.button(:id=>"content::cancel").click }
+  #action(:cancel) { |b| b.frm.button(:id=>"content::cancel").click }
     
 end
 
@@ -205,7 +203,7 @@ class SiteSetupChooseRolesIndiv < SiteSetupBase
   action(:continue) { |b| b.frm.button(:value=>"Continue").click }
   
   action(:back) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Aback&Fast%20track%20action=siteAddParticipantHandler.processDifferentRoleBack").click }
-  action(:cancel) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Acancel&Fast%20track%20action=siteAddParticipantHandler.processCancel").click }
+  #action(:cancel) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Acancel&Fast%20track%20action=siteAddParticipantHandler.processCancel").click }
   element(:user_role) { |b| b.frm.select(:id=>"content::user-row:0:role-select-selection") }
 
 end
@@ -248,7 +246,7 @@ class SiteSetupParticipantEmail < SiteSetupBase
   
   action(:continue) { |b| b.frm.button(:value=>"Continue").click }
   action(:back) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Acontinue&Fast%20track%20action=siteAddParticipantHandler.processEmailNotiBack").click }
-  action(:cancel) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Acontinue&Fast%20track%20action=siteAddParticipantHandler.processEmailNotiCancel").click }
+  #action(:cancel) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Acontinue&Fast%20track%20action=siteAddParticipantHandler.processEmailNotiCancel").click }
   element(:send_now) { |b| b.frm.radio(:id=>"content::noti-row:0:noti-select") }
   element(:dont_send) { |b| b.frm.radio(:id=>"content::noti-row:1:noti-select") }
     
@@ -273,7 +271,7 @@ class SiteSetupParticipantConfirm < SiteSetupBase
   end
   
   action(:back) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Aback&Fast%20track%20action=siteAddParticipantHandler.processConfirmBack").click }
-  action(:cancel) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Aback&Fast%20track%20action=siteAddParticipantHandler.processConfirmCancel").click }
+  #action(:cancel) { |b| b.frm.button(:name=>"command link parameters&Submitting%20control=content%3A%3Aback&Fast%20track%20action=siteAddParticipantHandler.processConfirmCancel").click }
 
 end
 
@@ -344,7 +342,6 @@ class EditSiteTools < SiteSetupBase
   element(:yes) { |b| b.frm.radio(:id=>"import_yes") }
   element(:import_sites) { |b| b.frm.select(:id=>"importSites") }
   action(:back) { |b| b.frm.button(:name=>"Back").click }
-  action(:cancel) { |b| b.frm.button(:name=>"Cancel").click }
 
 end
 
@@ -394,13 +391,8 @@ class DeleteSite < SiteSetupBase
 
   menu_elements
   
-  # Clicks the Remove button, then instantiates
-  # the SiteSetup class.
+  # Clicks the Remove button
   action(:remove) { |b| b.frm.button(:value=>"Remove").click }
-  
-  # Clicks the Cancel button, then instantiates
-  # the SiteSetup class.
-  action(:cancel) { |b| b.frm.button(:value=>"Cancel").click }
 
 end
 
@@ -427,7 +419,7 @@ class SiteType < SiteSetupBase
   element(:academic_term) { |b| b.frm.select(:id=>"selectTerm") }
   element(:select_template) { |b| b.frm.select(:id=>"templateSiteId") }
   element(:select_term) { |b| b.frm.select(:id=>"selectTermTemplate") }
-  action(:cancel) { |b| b.frm.button(:id=>"cancelCreate").click }
+  #action(:cancel) { |b| b.frm.button(:id=>"cancelCreate").click }
   element(:copy_users) { |b| b.frm.checkbox(:id=>"copyUsers") }
   element(:copy_content) { |b| b.frm.checkbox(:id=>"copyContent") }
 end
@@ -461,7 +453,6 @@ class AddMultipleTools < SiteSetupBase
   element(:web_content_source) { |b| b.frm.text_field(:id=>"source_sakai.iframe") }
   element(:more_web_content_tools) { |b| b.frm.select(:id=>"num_sakai.iframe")  }
   action(:back) { |b| b.frm.button(:name=>"Back").click }
-  action(:cancel) { |b| b.frm.button(:name=>"Cancel").click }
     
 end
   
@@ -470,7 +461,8 @@ end
 class CourseSectionInfo < SiteSetupBase
 
   menu_elements
-  
+  expected_element :subject
+
   # Clicks the Continue button, then instantiates
   # the CourseSiteInfo Class.
   action(:continue) { |b| b.frm.button(:value=>"Continue").click }
@@ -497,7 +489,6 @@ class CourseSectionInfo < SiteSetupBase
   element(:special_instructions) { |b| b.frm.text_field(:id=>"additional") }
   element(:add_more_rosters) { |b| b.frm.select(:id=>"number")  }
   action(:back) { |b| b.frm.button(:name=>"Back").click }
-  action(:cancel) { |b| b.frm.button(:name=>"Cancel").click }
 
 end
   
@@ -507,6 +498,7 @@ end
 class SiteAccess < SiteSetupBase
 
   menu_elements
+  expected_element :allow
   
   # The page element that displays the joiner role
   # select list. Use this method to validate whether the
@@ -524,7 +516,6 @@ class SiteAccess < SiteSetupBase
   element(:limited) { |b| b.frm.radio(:id=>"unjoinable") }
   element(:allow) { |b| b.frm.radio(:id=>"joinable") }
   action(:back) { |b| b.frm.button(:name=>"eventSubmit_doBack").click }
-  action(:cancel) { |b| b.frm.button(:name=>"eventSubmit_doCancel_create").click }
   element(:joiner_role) { |b| b.frm.select(:id=>"joinerRole") }
 
 end
@@ -571,7 +562,6 @@ class CourseSiteInfo < BasePage
   element(:site_contact_name) { |b| b.frm.text_field(:id=>"siteContactName") }
   element(:site_contact_email) { |b| b.frm.text_field(:id=>"siteContactEmail") }
   action(:back) { |b| b.frm.button(:name=>"Back").click }
-  action(:cancel) { |b| b.frm.button(:name=>"Cancel").click }
 
 end
   

data/lib/sambal-cle/rich_text.rb

@@ -24,6 +24,12 @@ module FCKEditor
     source_field(editor).value
   end
 
+  # Adds the specified string of text to the beginning of the existing
+  # text in the target FCKEditor.
+  def prepend(editor, string)
+    editor.td(:id, "xEditingArea").frame(:index=>0).send_keys(string)
+  end
+
   def entity_picker(editor)
     editor.div(:title=>"Sakai_Entity_Link").wait_until_present
     editor.div(:title=>"Sakai_Entity_Link").click

data/lib/sambal-cle/utilities.rb

@@ -16,16 +16,10 @@ module Utilities
     return $~.to_s
   end
 
+  # TODO: Pull this out because it's a dupe. Fix anything that's broken because this is commented out...
   # Shorthand method for making a data object for testing.
-  def make data_object_class, opts={}
-    data_object_class.new @browser, opts
-  end
-
-  # Transform for use with data object instance variables
-  # that refer to checkboxes or radio buttons.
-  def checkbox_setting(checkbox)
-    checkbox.set? ? :set : :clear
-  end
-  alias radio_setting checkbox_setting
+  #def make data_object_class, opts={}
+  #  data_object_class.new @browser, opts
+  #end
 
 end

data/lib/sambal-cle/workflows.rb

@@ -199,6 +199,7 @@ module Workflows
 
   # AssessmentsList class OR the TakeAssessmentList for students
   menu_link :assessments, :class=>"icon-sakai-samigo"
+  alias :tests_and_quizzes :assessments
 
   # UserMembership
   menu_link :user_membership, :class=>"icon-sakai-usermembership"
@@ -215,9 +216,4 @@ module Workflows
   # The Page Reset button, found on all Site pages
   menu_link :reset, :href=>/tool-reset/
 
-  # Login class.
-  menu_link :logout, :text=>"Logout"
-  alias :log_out :logout
-  alias :sign_out :logout
-
 end

data/lib/sambal-cle.rb

@@ -1,6 +1,5 @@
 require 'cgi'
-require 'watir-webdriver'
-require 'sambal-cle/page_maker.rb'
+require 'test-factory'
 Dir["#{File.dirname(__FILE__)}/sambal-cle/*.rb"].each {|f| require f }
 Dir["#{File.dirname(__FILE__)}/sambal-cle/page_objects/*.rb"].each {|f| require f }
 Dir["#{File.dirname(__FILE__)}/sambal-cle/data_objects/*.rb"].each {|f| require f }
@@ -12,20 +11,13 @@ Dir["#{File.dirname(__FILE__)}/sambal-cle/data_objects/*.rb"].each {|f| require
 # create the @browser variable used throughout the page classes
 class SakaiCLE
 
-  #include PageObject
-  #include ToolsMenu
-
   attr_reader :browser
 
   def initialize(web_browser, url)
     @browser = Watir::Browser.new web_browser
     @browser.window.resize_to(1400,900)
     @browser.goto url
-  end
-
-  # Returns the class containing the welcome page's page elements.
-  def page
-    Login.new @browser
+    $base_url=url
   end
 
 end

data/sambal-cle.gemspec

@@ -1,14 +1,13 @@
 spec = Gem::Specification.new do |s|
   s.name = 'sambal-cle'
-  s.version = '0.1.3'
-  s.summary = %q{Sakai-CLE functional testing API for the rSmart Collaborative Learning Environment}
-  s.description = %q{The Sambal-CLE gem provides an API for interacting with pages and page elements in rSmart's deployment of the Sakai Collaborative Learning Environment.}
+  s.version = '0.1.4'
+  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("**/**/**")
   s.test_files = Dir.glob("test/*test_rb")
-  s.authors = ["Abraham Heward"]
-  s.email = %w{"aheward@rsmart.com"}
-  s.homepage = 'https://github.com/rSmart/sambal-cle'
-  s.add_dependency 'watir-webdriver', '>= 0.5.5'
-  s.add_dependency 'selenium-webdriver', '>= 2.21.2'
+  s.authors = ["Abraham Heward", "Jon Utter"]
+  s.email = %w{"aheward@rsmart.com" "jutter@rsmart.com"}
+  s.homepage = 'https://github.com/rSmart'
+  s.add_dependency 'test-factory', '>= 0.0.1'
   s.required_ruby_version = '>= 1.9.2'
 end

data/test/add_assignment_to_calendar_spec.rb

@@ -6,9 +6,9 @@ describe "Assignment Due Date on Calendar" do
 
   include Utilities
   include Workflows
-  include PageHelper
-  include Randomizers
-  include DateMakers
+  include Foundry
+  include StringFactory
+  include DateFactory
 
   before :all do
 
@@ -18,21 +18,20 @@ describe "Assignment Due Date on Calendar" do
     @sakai = SakaiCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
 
-    @student = @directory['person1']['id']
-    @spassword = @directory['person1']['password']
-    @instructor1 = @directory['person3']['id']
-    @ipassword = @directory['person3']['password']
-
-    @instructor2 = @directory['person4']['id']
-    @password1 = @directory['person4']['password']
-
-    @sakai.page.login(@instructor1, @ipassword)
+    @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],
+                    :first_name=>@directory['person1']['firstname'], :last_name=>@directory['person1']['lastname']
+    @instructor1 = make UserObject, :id=>@directory['person3']['id'], :password=>@directory['person3']['password'],
+                        :first_name=>@directory['person3']['firstname'], :last_name=>@directory['person3']['lastname'],
+                        :type=>"Instructor"
+    @instructor2 = make UserObject, :id=>@directory['person4']['id'], :password=>@directory['person4']['password'],
+                        :first_name=>@directory['person4']['firstname'], :last_name=>@directory['person4']['lastname'],
+                        :type=>"Instructor"
+    @instructor1.log_in
 
     @site = make SiteObject
     @site.create
-
-    @site.add_official_participants :role=>"Student", :participants=>[@student]
-    @site.add_official_participants :role=>"Instructor", :participants=>[@instructor2]
+    @site.add_official_participants :role=>@student.type, :participants=>[@student.id]
+    @site.add_official_participants :role=>@instructor2.type, :participants=>[@instructor2.id]
 
     @assignment1 = make AssignmentObject, :site=>@site.name, :title=>random_string, :grade_scale=>"Letter grade", :instructions=>random_multiline(500, 10, :string), :open=>minutes_ago(5)
     @assignment2 = make AssignmentObject, :allow_resubmission=>:set, :add_due_date=>:set, :site=>@site.name, :title=>random_nicelink(15), :open=>hours_ago(5), :student_submissions=>"Inline only", :grade_scale=>"Letter grade", :instructions=>random_multiline(750, 13, :string)