sambal-cle 0.1.4 → 0.1.5

data/lib/sambal-cle/utilities.rb

@@ -16,10 +16,4 @@ 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
-
 end

data/lib/sambal-cle/workflows.rb

@@ -1,124 +1,123 @@
 # Workflows is a module containing helper navigation methods
 module Workflows
 
-  def self.menu_link name, opts={}
+  def self.menu_link name, title, opts={}
     define_method name.to_s do
-      @browser.link(opts).click
+        @browser.link(opts).click unless @browser.title=~/#{title}/
     end
   end
 
   # Opens "My Sites" and then clicks on the matching
-  # Site name. Shortens the name used for search so
+  # Site name--unless the specified site is what you're already in.
+  # Shortens the name used for search so
   # that truncated names are not a problem.
-  # Should be followed by the Home class.
-  #
-  # Will error out if there are not matching links.
   def open_my_site_by_name(name)
-    truncated_name = name[0..19]
-    @browser.link(:text, "My Sites").click
-    @browser.link(:text, /#{Regexp.escape(truncated_name)}/).click
+    unless @browser.title=~/#{name}/
+      @browser.link(:text, "My Sites").click
+      @browser.link(:text, /#{Regexp.escape(name[0..19])}/).click
+    end
   end
 
   # Clicks the "Account" link in the Adminstration Workspace
   # Should be followed by the UserAccount class.
   #
   # Throws an error if the link is not present.
-  menu_link :account, :text=>"Account"
+  menu_link :account, "Account", :text=>"Account"
 
   # Clicks the "Aliases" link in the Administration Workspace
   # menu, then should be followed by the Aliases class.
-  menu_link :aliases, :text=>"Aliases"
+  menu_link :aliases, "Aliases", :text=>"Aliases"
 
   # Clicks the link for the Administration Workspace, then
   # should be followed by the MyWorkspace class.
-  menu_link :administration_workspace, :text=>"Administration Workspace"
+  menu_link :administration_workspace, "Administration Workspace", :text=>"Administration Workspace"
 
   # Clicks the Announcements link goes to
   # the Announcements class.
-  menu_link :announcements, :class=>'icon-sakai-announcements'
+  menu_link :announcements, "Announcements", :class=>'icon-sakai-announcements'
 
   # Clicks the Assignments link, goes to
   # the AssignmentsList class.
-  menu_link :assignments, :class=>"icon-sakai-assignment-grades"
+  menu_link :assignments, "Assignments", :class=>"icon-sakai-assignment-grades"
 
   # BasicLTI class
-  menu_link :basic_lti, :class=>"icon-sakai-basiclti"
+  menu_link :basic_lti, "Basic LTI", :class=>"icon-sakai-basiclti"
 
   # Blogs class
-  menu_link :blogs, :class=>"icon-sakai-blogwow"
+  menu_link :blogs, "Blogs", :class=>"icon-sakai-blogwow"
 
   # Clicks the Blogger link in the Site menu and
   # instantiates the Blogger Class.
-  menu_link :blogger, :class=>"icon-blogger"
+  menu_link :blogger, "Blogger", :class=>"icon-blogger"
 
   # Clicks the Calendar link, then instantiates
   # the Calendar class.
-  menu_link :calendar, :text=>"Calendar"
+  menu_link :calendar, "Calendar", :text=>"Calendar"
 
-  menu_link :certification, :text=>"Certification"
+  menu_link :certification, "Certification", :text=>"Certification"
 
   # ChatRoom class
-  menu_link :chat_room, :class=>"icon-sakai-chat"
+  menu_link :chat_room, "Chat Room", :class=>"icon-sakai-chat"
 
-  menu_link :configuration_viewer, :text=>"Configuration Viewer"
-  menu_link :customizer, :text=>"Customizer"
+  menu_link :configuration_viewer, "Configuration Viewer", :text=>"Configuration Viewer"
+  menu_link :customizer, "Customizer", :text=>"Customizer"
 
   # JForum page class.
-  menu_link :discussion_forums, :class=>"icon-sakai-jforum-tool"
+  menu_link :discussion_forums, "Discussion Forums", :class=>"icon-sakai-jforum-tool"
 
   # DropBox class
-  menu_link :drop_box, :class=>"icon-sakai-dropbox"
+  menu_link :drop_box, "Drop Box", :class=>"icon-sakai-dropbox"
 
-  menu_link :email, :text=>"Email"
+  menu_link :email, "Email", :text=>"Email"
 
   # Email Archive class
-  menu_link :email_archive, :class=>"icon-sakai-mailbox"
+  menu_link :email_archive, "Email Archive", :class=>"icon-sakai-mailbox"
 
-  menu_link :email_template_administration, :text=>"Email Template Administration"
+  menu_link :email_template_administration, "Email Template Administration", :text=>"Email Template Administration"
 
   # EvaluationSystem class
-  menu_link :evaluation_system, :class=>"icon-sakai-rsf-evaluation"
+  menu_link :evaluation_system, "Evaluation System", :class=>"icon-sakai-rsf-evaluation"
 
   # Feedback class
-  menu_link :feedback, :class=>"icon-sakai-postem"
+  menu_link :feedback, "Feedback", :class=>"icon-sakai-postem"
 
   # Forms class
-  menu_link :forms, :text=>"Forms", :class=>"icon-sakai-metaobj"
+  menu_link :forms, "Forms", :text=>"Forms", :class=>"icon-sakai-metaobj"
 
   # Forums class.
-  menu_link :forums, :text=>"Forums"
+  menu_link :forums, "Forums", :text=>"Forums"
 
   # Glossary Class.
-  menu_link :glossary, :text=>"Glossary"
+  menu_link :glossary, "Glossary", :text=>"Glossary"
 
   # Gradebook Class.
-  menu_link :gradebook, :text=>"Gradebook"
+  menu_link :gradebook, "Gradebook", :text=>"Gradebook"
 
   # Gradebook2 class
-  menu_link :gradebook2, :text=>"Gradebook2"
+  menu_link :gradebook2, "Gradebook2", :text=>"Gradebook2"
 
-  menu_link :help, :text=>"Help"
+  menu_link :help, "Help", :text=>"Help"
 
   # Home class--unless the target page happens to be
   # My Workspace, in which case the MyWorkspace
   # page should be used.
-  menu_link :home, :text=>"Home"
+  menu_link :home, "Home", :text=>"Home"
 
   # Job Scheduler class.
-  menu_link :job_scheduler, :text=>"Job Scheduler"
+  menu_link :job_scheduler, "Job Scheduler", :text=>"Job Scheduler"
 
   # Lessons class
-  menu_link :lessons, :text=>"Lessons"
+  menu_link :lessons, "Lessons", :text=>"Lessons"
 
-  menu_link :lesson_builder, :text=>"Lesson Builder"
-  menu_link :link_tool, :text=>"Link Tool"
-  menu_link :live_virtual_classroom, :text=>"Live Virtual Classroom"
+  menu_link :lesson_builder, "Lesson Builder", :text=>"Lesson Builder"
+  menu_link :link_tool, "Link Tool", :text=>"Link Tool"
+  menu_link :live_virtual_classroom, "Live Virtual Classroom", :text=>"Live Virtual Classroom"
 
   # Matrices Class
-  menu_link :matrices, :text=>"Matrices"
+  menu_link :matrices, "Matrices", :text=>"Matrices"
 
   # MediaGallery class
-  menu_link :media_gallery, :class=>"icon-sakai-kaltura"
+  menu_link :media_gallery, "Media Gallery", :class=>"icon-sakai-kaltura"
 
   menu_link :membership, :text=>"Membership"
   menu_link :memory, :text=>"Memory"
@@ -128,92 +127,94 @@ module Workflows
   menu_link :my_sites, :text=>"My Sites"
 
   # MyWorkspace Class.
-  menu_link :my_workspace, :text=>"My Workspace"
+  menu_link :my_workspace, "My Workspace", :text=>"My Workspace"
 
   # News
-  menu_link :news, :class=>"icon-sakai-news"
+  menu_link :news, "News", :class=>"icon-sakai-news"
 
-  menu_link :online, :text=>"On-Line"
-  menu_link :oauth_providers, :text=>"Oauth Providers"
-  menu_link :oauth_tokens, :text=>"Oauth Tokens"
+  menu_link :online, "On-Line", :text=>"On-Line"
+  menu_link :oauth_providers, "Oauth Providers", :text=>"Oauth Providers"
+  menu_link :oauth_tokens, "Oauth Tokens", :text=>"Oauth Tokens"
   menu_link :openSyllabus, :text=>"OpenSyllabus"
 
   # Podcasts
-  menu_link :podcasts, :class=>"icon-sakai-podcasts"
+  menu_link :podcasts, "Podcasts", :class=>"icon-sakai-podcasts"
 
   # Polls class
-  menu_link :polls, :class=>"icon-sakai-poll"
+  menu_link :polls, "Polls", :class=>"icon-sakai-poll"
 
   # Portfolios class
-  menu_link :portfolios, :class=>"icon-osp-presentation"
+  menu_link :portfolios, "Portfolios", :class=>"icon-osp-presentation"
 
   # PortfolioTemplates
-  menu_link :portfolio_templates, :text=>"Portfolio Templates"
+  menu_link :portfolio_templates, "Portfolio Templates", :text=>"Portfolio Templates"
 
-  menu_link :preferences, :text=>"Preferences"
+  menu_link :preferences, "Preferences", :text=>"Preferences"
 
-  menu_link :profile, :text=>"Profile"
+  menu_link :profile, "Profile", :text=>"Profile"
 
   # Profile2 class
-  menu_link :profile2, :class=>"icon-sakai-profile2"
+  menu_link :profile2, "Profile2", :class=>"icon-sakai-profile2"
 
-  menu_link :realms, :text=>"Realms"
+  menu_link :realms, "Realms", :text=>"Realms"
 
   # Resources class.
-  menu_link :resources, :text=>"Resources"
+  menu_link :resources, "Resources", :text=>"Resources"
 
   # Roster
-  menu_link :roster, :class=>"icon-sakai-site-roster"
+  menu_link :roster, "Roster", :class=>"icon-sakai-site-roster"
 
-  menu_link :rsmart_support, :text=>"rSmart Support"
+  menu_link :rsmart_support, "rSmart Support", :text=>"rSmart Support"
 
   # Because "Search" is used in many pages,
   # The Search button found in the Site Management
   # Menu must be given the more explicit name
-  menu_link :site_management_search, :class=>"icon-sakai-search"
+  menu_link :site_management_search, "Search", :class=>"icon-sakai-search"
 
   # Sections
-  menu_link :sections, :class=>"icon-sakai-sections"
+  menu_link :sections, "Sections", :class=>"icon-sakai-sections"
 
-  menu_link :site_archive, :text=>"Site Archive"
+  menu_link :site_archive, "Site Archive", :text=>"Site Archive"
 
   # SiteEditor class.
-  menu_link :site_editor, :text=>"Site Editor"
+  menu_link :site_editor, "Site Editor", :text=>"Site Editor"
 
   # SiteSetup class.
-  menu_link :site_setup, :text=>"Site Setup"
+  menu_link :site_setup, "Site Setup", :text=>"Site Setup"
 
-  menu_link :site_statistics, :text=>"Site Statistics"
+  menu_link :site_statistics, "Site Statistics", :text=>"Site Statistics"
 
   # Sites class.
-  menu_link :sites, :class=>"icon-sakai-sites"
+  menu_link :sites, "Sites", :class=>"icon-sakai-sites"
 
-  menu_link :skin_manager, :text=>"Skin Manager"
-  menu_link :super_user, :text=>"Super User"
+  menu_link :skin_manager, "Skin Manager", :text=>"Skin Manager"
+  menu_link :super_user, "Super User", :text=>"Super User"
 
   # Styles
-  menu_link :styles, :text=>"Styles"
+  menu_link :styles, "Styles", :text=>"Styles"
 
   # Syllabus class.
-  menu_link :syllabus, :text=>"Syllabus"
+  menu_link :syllabus, "Syllabus", :text=>"Syllabus"
 
   # AssessmentsList class OR the TakeAssessmentList for students
-  menu_link :assessments, :class=>"icon-sakai-samigo"
+  menu_link :assessments, "Tests & Quizzes", :class=>"icon-sakai-samigo"
   alias :tests_and_quizzes :assessments
 
   # UserMembership
-  menu_link :user_membership, :class=>"icon-sakai-usermembership"
+  menu_link :user_membership, "User Membership", :class=>"icon-sakai-usermembership"
 
   # Users
-  menu_link :users, :class=>"icon-sakai-users"
+  menu_link :users, "Users", :class=>"icon-sakai-users"
 
   # WebContent
-  menu_link :web_content, :class=>"icon-sakai-iframe"
+  menu_link :web_content, "Web Content", :class=>"icon-sakai-iframe"
 
   # Wikis
-  menu_link :wiki, :class=>"icon-sakai-rwiki"
+  menu_link :wiki, "Wiki", :class=>"icon-sakai-rwiki"
 
   # The Page Reset button, found on all Site pages
-  menu_link :reset, :href=>/tool-reset/
+  def reset
+    @browser.link(:href=>/tool-reset/).click
+  end
 
 end

data/lib/sambal-cle.rb

@@ -7,9 +7,9 @@ Dir["#{File.dirname(__FILE__)}/sambal-cle/data_objects/*.rb"].each {|f| require
 # Initialize this class at the start of your test cases to
 # open the specified test browser at the specified Sakai welcome page URL.
 #
-# The initialization will return the LoginPage class object as well as
+# The initialization will
 # create the @browser variable used throughout the page classes
-class SakaiCLE
+class SambalCLE
 
   attr_reader :browser
 

data/sambal-cle.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'sambal-cle'
-  s.version = '0.1.4'
+  s.version = '0.1.5'
   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("**/**/**")
@@ -8,6 +8,6 @@ spec = Gem::Specification.new do |s|
   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.add_dependency 'test-factory', '>= 0.0.7'
   s.required_ruby_version = '>= 1.9.2'
 end

data/test/add_assignment_to_calendar_spec.rb

@@ -15,7 +15,7 @@ describe "Assignment Due Date on Calendar" do
     # Get the test configuration data
     @config = YAML.load_file("config.yml")
     @directory = YAML.load_file("directory.yml")
-    @sakai = SakaiCLE.new(@config['browser'], @config['url'])
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
 
     @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],
@@ -28,10 +28,10 @@ describe "Assignment Due Date on Calendar" do
                         :type=>"Instructor"
     @instructor1.log_in
 
-    @site = make SiteObject
+    @site = make CourseSiteObject
     @site.create
-    @site.add_official_participants :role=>@student.type, :participants=>[@student.id]
-    @site.add_official_participants :role=>@instructor2.type, :participants=>[@instructor2.id]
+    @site.add_official_participants @student.type, @student.id
+    @site.add_official_participants @instructor2.type, @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)

data/test/assessment_create_spec.rb

@@ -14,7 +14,7 @@ describe "Assessments" do
     # Get the test configuration data
     @config = YAML.load_file("config.yml")
     @directory = YAML.load_file("directory.yml")
-    @sakai = SakaiCLE.new(@config['browser'], @config['url'])
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
 
     @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],

data/test/assessment_feedback_spec.rb

@@ -0,0 +1,78 @@
+require 'rspec'
+require 'sambal-cle'
+require 'yaml'
+
+describe "Assessment Feedback" do
+
+  include Workflows
+  include Foundry
+  include StringFactory
+  include DateFactory
+
+  before :all do
+    # Get the test configuration data
+    @config = YAML.load_file("config.yml")
+    @directory = YAML.load_file("directory.yml")
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
+    @browser = @sakai.browser
+
+    @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],
+                    :first_name=>@directory['person1']['firstname'], :last_name=>@directory['person1']['lastname']
+    @instructor = make UserObject, :id=>@directory['person3']['id'], :password=>@directory['person3']['password'],
+                        :first_name=>@directory['person3']['firstname'], :last_name=>@directory['person3']['lastname'],
+                        :type=>"Instructor"
+    @instructor.log_in
+
+    @site = make CourseSiteObject
+    @site.create
+    @site.add_official_participants @student.type, @student.id
+
+    @assessment = make AssessmentObject, :site=>@site.name,
+                       :feedback_delivery=>:immediate_feedback,
+                       :feedback_authoring=>:both_feedback_levels,
+                       :release_options=>[:release_question_level_feedback, :release_selection_level_feedback]
+    @assessment.create
+
+    @assessment.add_question :type=>"Multiple Choice",
+                             :answers_feedback=>[random_alphanums, random_alphanums, random_alphanums, random_alphanums],
+                             :correct_answer_feedback=>random_alphanums,
+                             :incorrect_answer_feedback=>random_alphanums
+    @assessment.add_question :type=>"Survey",
+                             :feedback=>random_alphanums
+    @assessment.add_question :type=>"Short Answer/Essay",
+                             :feedback=>random_alphanums
+    @assessment.add_question :type=>"Fill in the Blank",
+                             :correct_answer_feedback=>random_alphanums,
+                             :incorrect_answer_feedback=>random_alphanums
+    @assessment.add_question :type=>"Numeric Response",
+                             :correct_answer_feedback=>random_alphanums,
+                             :incorrect_answer_feedback=>random_alphanums
+    @assessment.add_question :type=>"Matching",
+                             :correct_answer_feedback=>random_alphanums,
+                             :incorrect_answer_feedback=>random_alphanums
+    @assessment.add_question :type=>"True False",
+                             :correct_answer_feedback=>random_alphanums,
+                             :incorrect_answer_feedback=>random_alphanums
+    @assessment.add_question :type=>"Audio Recording",
+                             :feedback=>random_alphanums
+    @assessment.add_question :type=>"File Upload",
+                             :feedback=>random_alphanums
+    @assessment.add_question :type=>"Calculated Question",
+                             :correct_answer_feedback=>random_alphanums,
+                             :incorrect_answer_feedback=>random_alphanums
+
+    @assessment.publish
+
+    @instructor.log_out
+
+  end
+
+  after :all do
+    @browser.close
+  end
+
+  xit "feedback" do
+    # Test cases pending underlying submission code.
+  end
+
+end

data/test/assessment_publish_spec.rb

@@ -0,0 +1,102 @@
+require 'rspec'
+require 'sambal-cle'
+require 'yaml'
+
+describe "Publishing Assessments" do
+
+  include Workflows
+  include Foundry
+  include DateFactory
+
+  before :all do
+    # Get the test configuration data
+    @config = YAML.load_file("config.yml")
+    @directory = YAML.load_file("directory.yml")
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
+    @browser = @sakai.browser
+
+    @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 CourseSiteObject
+    @site.create
+    @site.add_official_participants @student.type, @student.id
+    @site.add_official_participants @instructor2.type, @instructor2.id
+
+    @assessment1 = make AssessmentObject, :site=>@site.name
+    @assessment1.create
+
+    1.times{ @assessment1.add_part }
+    3.times{ @assessment1.add_question }
+
+    @assessment2 = make AssessmentObject, :site=>@site.name
+    @assessment2.create
+
+    1.times{ @assessment2.add_part }
+    3.times{ @assessment2.add_question }
+
+    @assessment2.publish
+
+    @assessment3 = make AssessmentObject, :site=>@site.name, :available_date=>in_an_hour
+    @assessment3.create
+
+    1.times{ @assessment3.add_part }
+    3.times{ @assessment3.add_question }
+
+    @assessment3.publish
+
+    @instructor1.log_out
+
+  end
+
+  after :all do
+    @browser.close
+  end
+
+  it "Instructors can see pending, published, and inactive assessments made by others" do
+    @instructor2.log_in
+    open_my_site_by_name @site.name
+    tests_and_quizzes
+    on AssessmentsList do |list|
+      list.pending_assessment_titles.should include @assessment1.title
+      list.published_assessment_titles.should include @assessment2.title
+      list.inactive_assessment_titles.should include @assessment3.title
+    end
+    @instructor2.log_out
+  end
+
+  it "Students can see published assessments that are currently available" do
+    @student.log_in
+    open_my_site_by_name @site.name
+    tests_and_quizzes
+    on StudentAssessmentsList do |list|
+      list.available_assessments.should include @assessment2.title
+    end
+  end
+
+  it "Students cannot see published assessments prior to the available date" do
+    @student.log_in
+    open_my_site_by_name @site.name
+    tests_and_quizzes
+    on StudentAssessmentsList do |list|
+      list.available_assessments.should_not include @assessment3.title
+    end
+  end
+
+  it "Students cannot see unpublished assessments" do
+    @student.log_in
+    open_my_site_by_name @site.name
+    tests_and_quizzes
+    on StudentAssessmentsList do |list|
+      list.available_assessments.should_not include @assessment1.title
+    end
+  end
+
+end

data/test/assignment_announcements_spec.rb

@@ -15,7 +15,7 @@ describe "Assignments appearing in Announcements" do
     # Get the test configuration data
     @config = YAML.load_file("config.yml")
     @directory = YAML.load_file("directory.yml")
-    @sakai = SakaiCLE.new(@config['browser'], @config['url'])
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
 
     @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],
@@ -28,10 +28,10 @@ describe "Assignments appearing in Announcements" do
                         :type=>"Instructor"
     @instructor1.log_in
 
-    @site = make SiteObject
+    @site = make CourseSiteObject
     @site.create
-    @site.add_official_participants :role=>@student.type, :participants=>[@student.id]
-    @site.add_official_participants :role=>@instructor2.type, :participants=>[@instructor2.id]
+    @site.add_official_participants @student.type, @student.id
+    @site.add_official_participants @instructor2.type, @instructor2.id
 
     @assignment1 = make AssignmentObject, :status=>"Draft", :add_open_announcement=>:set, :site=>@site.name, :title=>random_xss_string(30), :open=>in_an_hour, :student_submissions=>"Attachments only", :grade_scale=>"Points", :max_points=>"100", :instructions=>random_multiline(600, 12, :string)
     @assignment2 = make AssignmentObject, :site=>@site.name, :add_open_announcement=>:set, :open=>an_hour_ago

data/test/assignment_duplicate_spec.rb

@@ -15,7 +15,7 @@ describe "Duplicating an Assignment" do
     # Get the test configuration data
     @config = YAML.load_file("config.yml")
     @directory = YAML.load_file("directory.yml")
-    @sakai = SakaiCLE.new(@config['browser'], @config['url'])
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
 
     @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],
@@ -28,10 +28,10 @@ describe "Duplicating an Assignment" do
                         :type=>"Instructor"
     @instructor1.log_in
 
-    @site = make SiteObject
+    @site = make CourseSiteObject
     @site.create
-    @site.add_official_participants :role=>@student.type, :participants=>[@student.id]
-    @site.add_official_participants :role=>@instructor2.type, :participants=>[@instructor2.id]
+    @site.add_official_participants @student.type, @student.id
+    @site.add_official_participants @instructor2.type, @instructor2.id
 
     @assignment = make AssignmentObject, :site=>@site.name, :title=>random_string(25), :open=>next_monday, :grade_scale=>"Pass", :instructions=>random_alphanums
 

data/test/assignment_gradebook_spec.rb

@@ -15,7 +15,7 @@ describe "Assignments" do
     # Get the test configuration data
     @config = YAML.load_file("config.yml")
     @directory = YAML.load_file("directory.yml")
-    @sakai = SakaiCLE.new(@config['browser'], @config['url'])
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
 
     @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],
@@ -28,10 +28,10 @@ describe "Assignments" do
                         :type=>"Instructor"
     @instructor1.log_in
 
-    @site = make SiteObject
+    @site = make CourseSiteObject
     @site.create
-    @site.add_official_participants :role=>@student.type, :participants=>[@student.id]
-    @site.add_official_participants :role=>@instructor2.type, :participants=>[@instructor2.id]
+    @site.add_official_participants @student.type, @student.id
+    @site.add_official_participants @instructor2.type, @instructor2.id
 
     @assignment = make AssignmentObject, :site=>@site.name, :title=>random_string(25), :open=>next_monday, :grade_scale=>"Pass", :instructions=>random_multiline(300, 15, :string)
 

data/test/assignment_permissions_spec.rb

@@ -17,7 +17,7 @@ describe "Assignment Permissions" do
     # Get the test configuration data
     @config = YAML.load_file("config.yml")
     @directory = YAML.load_file("directory.yml")
-    @sakai = SakaiCLE.new(@config['browser'], @config['url'])
+    @sakai = SambalCLE.new(@config['browser'], @config['url'])
     @browser = @sakai.browser
 
     @student = make UserObject, :id=>@directory['person1']['id'], :password=>@directory['person1']['password'],
@@ -30,12 +30,12 @@ describe "Assignment Permissions" do
                         :type=>"Instructor"
     @instructor1.log_in
 
-    @site = make SiteObject
+    @site = make CourseSiteObject
     @site.create
-    @site.add_official_participants :role=>@student.type, :participants=>[@student.id]
-    @site.add_official_participants :role=>@instructor2.type, :participants=>[@instructor2.id]
+    @site.add_official_participants @student.type, @student.id
+    @site.add_official_participants @instructor2.type, @instructor2.id
 
-    @site = make SiteObject
+    @site = make CourseSiteObject
     @site.create
 
     @site.add_official_participants :role=>"Student", :participants=>[@student]