sambal-cle 0.1.4 → 0.1.5

data/Gemfile

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gem 'rspec'
+gem 'test-factory'
+gem 'watir-webdriver'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    sambal-cle (0.1.5)
+      test-factory (>= 0.0.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.7)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    libwebsocket (0.1.3)
+      addressable
+    multi_json (1.2.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rubyzip (0.9.7)
+    selenium-webdriver (2.25.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    test-factory (0.0.2)
+      watir-webdriver (>= 0.6.1)
+    watir-webdriver (0.6.1)
+      selenium-webdriver (>= 2.18.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec
+  sambal-cle!
+  test-factory
+  watir-webdriver

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

@@ -25,8 +25,8 @@ class AnnouncementObject
   alias :name :title
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    announcements unless @browser.title=~/Announcements$/
+    open_my_site_by_name
+    announcements
     on_page Announcements do |page|
       page.add
     end
@@ -43,13 +43,13 @@ class AnnouncementObject
   end
 
   def edit opts={}
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    announcements unless @browser.title=~/Announcements$/
+    open_my_site_by_name @site
+    announcements
     on_page Announcements do |list|
       list.edit @title
     end
     on AddEditAnnouncements do |edit|
-      edit.title.set opts[:title] unless opts[:title]==nil
+      edit.title.fit opts[:title]
       edit.send(opts[:access]) unless opts[:access]==nil
       edit.send(opts[:availability]) unless opts[:availability]==nil
       unless opts[:body]==nil
@@ -61,8 +61,8 @@ class AnnouncementObject
   end
 
   def view
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    announcements unless @browser.title=~/Announcements$/
+    open_my_site_by_name @site
+    announcements
     on Announcements do |list|
       list.view @title
     end

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

@@ -6,6 +6,21 @@ class AssessmentObject
   include DateFactory
   include Workflows
 
+  def question_types
+    {
+      :"Multiple Choice"=>MultipleChoiceQuestion,
+      :Survey=>SurveyQuestion,
+      :"Short Answer/Essay"=>ShortAnswerQuestion,
+      :"Fill in the Blank"=>FillInBlankQuestion,
+      :"Numeric Response"=>NumericResponseQuestion,
+      :Matching=>MatchingQuestion,
+      :"True False"=>TrueFalseQuestion,
+      :"Audio Recording"=>AudioRecordingQuestion,
+      :"File Upload"=>FileUploadQuestion,
+      :"Calculated Question"=>CalculatedQuestion
+    }
+  end
+
   attr_accessor :title, :site, :questions, :parts, :status, :type, :available_date,
                 :due_date, :retract_date, :feedback_authoring, :feedback_delivery, :feedback_date,
                 :release_to, :release, :release_options, :secondary_id, :secondary_password,
@@ -47,8 +62,8 @@ class AssessmentObject
   end
 
   def create
-    my_workspace.open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    tests_and_quizzes unless @browser.title=~/Tests & Quizzes$/
+    open_my_site_by_name @site
+    tests_and_quizzes
     reset
     on_page AssessmentsList do |page|
       page.title.set @title
@@ -117,8 +132,8 @@ class AssessmentObject
   end
 
   def publish
-    my_workspace.open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    tests_and_quizzes unless @browser.title=~/Tests & Quizzes$/
+    open_my_site_by_name @site
+    tests_and_quizzes
     reset
     on AssessmentsList do |list|
       list.publish @title
@@ -144,10 +159,11 @@ class AssessmentObject
     position
     defaults = {
         :assessment=>@title,
-        :part=>@parts[rand(@parts.length)].title
+        :part=>@parts[rand(@parts.length)].title,
+        :type=>question_types.keys.shuffle[0]
     }
     options = defaults.merge(opts)
-    question = make QuestionObject, options
+    question = make question_types[options[:type].to_sym], options
     question.create
     @questions << question
   end
@@ -155,8 +171,8 @@ class AssessmentObject
   private
 
   def position
-    my_workspace.open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    tests_and_quizzes unless @browser.title=~/Tests & Quizzes$/
+    open_my_site_by_name @site
+    tests_and_quizzes
     unless @browser.frame(:class=>"portletMainIframe").h3.text=="Questions: #{@title}"
       reset
       on AssessmentsList do |list|
@@ -167,75 +183,10 @@ class AssessmentObject
 
 end
 
-class QuestionObject
-
-  include Foundry
-  include Utilities
-  include Workflows
-  include StringFactory
-
-  attr_accessor :type, :assessment, :text, :point_value, :part,
-                # Multiple Choice attributes...
-                :correct_type, :answer_credit, :negative_point_value
-
-  def initialize(browser, opts={})
-    @browser = browser
-    defaults = {
-        :type=>QUESTION_TYPES.keys[rand(QUESTION_TYPES.length)],
-        :text=>random_alphanums,
-        :point_value=>(rand(100)+1).to_s
-
-    }
-    options = defaults.merge(opts)
-    set_options(options)
-    requires @assessment
-  end
-
-  QUESTION_TYPES = {
-      :"Multiple Choice"=>:add_multiple_choice,
-      :Survey=>:add_survey#,
-      #:"Short Answer/Essay"=>:add_short_answer,
-      #:"Fill in the Blank"=>:add_fill_in_the_blank,
-      #:"Numeric Response"=>:add_numeric,
-      #:Matching=>:add_matching,
-      #:"True False"=>:add_true_false,
-      #:"Audio Recording"=>:add_audio,
-      #:"File Upload"=>:add_file_upload,
-      #:"Calculated Question"=>:add_calculated_question
-  }
-
-  def create
-    on EditAssessment do |edit|
-      edit.add_question_to_part(@part).select @type
-    end
-    self.send(QUESTION_TYPES[@type.to_sym])
-  end
-
-  private
-
-  def add_multiple_choice
-    on MultipleChoice do |add|
-      add.answer_point_value.set @point_value
-      add.question_text.set @text
-      add.send(@correct_type).set
-      add.send(@answer_credit).set unless @answer_credit==nil
-      add.negative_point_value.set @negative_point_value unless @negative_point_value==nil
-
-    end
-  end
-
-  def add_survey
-    on Survey do |add|
-
-    end
-  end
-
-end
-
 class PartObject
 
   include Foundry
-  include Utilities
+  include DataFactory
   include Workflows
   include StringFactory
 
@@ -283,6 +234,4 @@ class PartObject
     
   end
   
-end
-    
-      
+end

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

@@ -0,0 +1,26 @@
+class AssessmentSubmissionObject
+
+  include Foundry
+  include DataFactory
+  include StringFactory
+  include DateFactory
+  include Workflows
+
+  attr_accessor :assessment
+
+  def initialize(browser, opts={})
+    @browser = browser
+
+    defaults = {
+
+    }
+    options = defaults.merge(opts)
+
+    set_options(options)
+    # Note that the assessment requirement is for the Assessment Object itself.
+    requires @assessment
+  end
+
+
+
+end

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

@@ -38,10 +38,10 @@ class AssignmentObject
   alias :name :title
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
+    open_my_site_by_name @site
 
     # Go to assignments page
-    assignments unless @browser.title=~/Assignments$/
+    assignments
 
     on_page AssignmentsList do |list|
       list.add
@@ -50,40 +50,40 @@ class AssignmentObject
       @allow_resubmission==nil ? @allow_resubmission=checkbox_setting(add.allow_resubmission) : add.allow_resubmission.send(@allow_resubmission)
       if @allow_resubmission==:set
         add.num_resubmissions.wait_until_present
-        @num_resubmissions==nil ? @num_resubmissions=add.num_resubmissions.selected_options[0].text : add.num_resubmissions.select(@num_resubmissions)
-        @resubmission[:MON]==nil ? @resubmission[:MON]=add.resub_until_month.selected_options[0].text : add.resub_until_month.select(@resubmission[:MON])
-        @resubmission[:day_of_month]==nil ? @resubmission[:day_of_month]=add.resub_until_day.selected_options[0].text : add.select(@resubmission[:day_of_month])
-        @resubmission[:year]==nil ? @resubmission[:year]=add.resub_until_year.selected_options[0].text : add.select(@resubmission[:year])
-        @resubmission[:hour]==nil ? @resubmission[:hour]=add.resub_until_hour.selected_options[0].text : add.select(@resubmission[:hour])
-        @resubmission[:minute_rounded]==nil ? @resubmission[:minute_rounded]=add.resub_until_minute.selected_options[0].text : add.select(@resubmission[:minute_rounded])
-        @resubmission[:MERIDIAN]==nil ? @resubmission[:MERIDIAN]=add.resub_until_meridian.selected_options[0].text : add.select(@resubmission[:MERIDIAN])
+        @num_resubmissions=get_or_select(@num_resubmissions, add.num_resubmissions)
+        @resubmission[:MON]=get_or_select(@resubmission[:MON], add.resub_until_month)
+        @resubmission[:day_of_month]=get_or_select(@resubmission[:day_of_month], add.resub_until_day)
+        @resubmission[:year]=get_or_select(@resubmission[:year], add.resub_until_year)
+        @resubmission[:hour]=get_or_select(@resubmission[:hour], add.resub_until_hour)
+        @resubmission[:minute_rounded]=get_or_select(@resubmission[:minute_rounded], add.resub_until_minute)
+        @resubmission[:MERIDIAN]=get_or_select(@resubmission[:MERIDIAN], add.resub_until_meridian)
       end
       add.title.set @title
       add.instructions=@instructions
-      @student_submissions==nil ? @student_submissions=add.student_submissions.selected_options[0].text : add.student_submissions.select(@student_submissions)
-      @grade_scale==nil ? @grade_scale=add.grade_scale.selected_options[0].text : add.grade_scale.select(@grade_scale)
-      @open[:MON]==nil ? @open[:MON]=add.open_month.selected_options[0].text : add.open_month.select(@open[:MON])
+      @student_submissions=get_or_select(@student_submissions, add.student_submissions)
+      @grade_scale=get_or_select(@grade_scale, add.grade_scale)
+      @open[:MON]=get_or_select(@open[:MON], add.open_month)
       add.max_points.set(@max_points) unless @max_points==nil
-      @open[:year]==nil ? @open[:year]=add.open_year.selected_options[0].text : add.open_year.select(@open[:year])
-      @open[:day_of_month]==nil ? @open[:day_of_month]=add.open_day.selected_options[0].text : add.open_day.select(@open[:day_of_month])
-      @open[:hour]==nil ? @open[:hour]=add.open_hour.selected_options[0].text : add.open_hour.select(@open[:hour])
-      @open[:minute_rounded]==nil ? @open[:minute_rounded]=add.open_minute.selected_options[0].text : add.open_minute.select(@open[:minute_rounded])
-      @open[:MERIDIAN]==nil ? @open[:MERIDIAN]=add.open_meridian.selected_options[0].text : add.open_meridian.select(@open[:MERIDIAN])
+      @open[:year]=get_or_select(@open[:year], add.open_year)
+      @open[:day_of_month]=get_or_select(@open[:day_of_month], add.open_day)
+      @open[:hour]=get_or_select(@open[:hour], add.open_hour)
+      @open[:minute_rounded]=get_or_select(@open[:minute_rounded], add.open_minute)
+      @open[:MERIDIAN]=get_or_select(@open[:MERIDIAN], add.open_meridian)
       @add_due_date==nil ? @add_due_date=checkbox_setting(add.add_due_date) : add.add_due_date.send(@add_due_date)
       @add_open_announcement==nil ? @add_open_announcement=checkbox_setting(add.add_open_announcement) : add.add_open_announcement.send(@add_open_announcement)
       @add_to_gradebook==nil ? @add_to_gradebook=radio_setting(add.add_to_gradebook) : add.add_to_gradebook.send(@add_to_gradebook)
-      @due[:MON]==nil ? @due[:MON]=add.due_month.selected_options[0].text : add.due_month.select(@due[:MON])
-      @due[:year]==nil ? @due[:year]=add.due_year.selected_options[0].text : add.due_year.select(@due[:year])
-      @due[:day_of_month]==nil ? @due[:day_of_month]=add.due_day.selected_options[0].text : add.due_day.select(@due[:day_of_month])
-      @due[:hour]==nil ? @due[:hour]=add.due_hour.selected_options[0].text : add.due_hour.select(@due[:hour])
-      @due[:minute_rounded]==nil ? @due[:minute_rounded]=add.due_minute.selected_options[0].text : add.due_minute.select(@due[:minute_rounded])
-      @due[:MERIDIAN]==nil ? @due[:MERIDIAN]=add.due_meridian.selected_options[0].text : add.due_meridian.select(@due[:MERIDIAN])
-      @accept_until[:MON]==nil ? @accept_until[:MON]=add.accept_month.selected_options[0].text : add.accept_month.select(@accept_until[:MON])
-      @accept_until[:year]==nil ? @accept_until[:year]=add.accept_year.selected_options[0].text : add.accept_year.select(@accept_until[:year])
-      @accept_until[:day_of_month]==nil ? @accept_until[:day_of_month]=add.accept_day.selected_options[0].text : add.accept_day.select(@accept_until[:day_of_month])
-      @accept_until[:hour]==nil ? @accept_until[:hour]=add.accept_hour.selected_options[0].text : add.accept_hour.select(@accept_until[:hour])
-      @accept_until[:minute_rounded]==nil ? @accept_until[:minute_rounded]=add.accept_minute.selected_options[0].text : add.accept_minute.select(@accept_until[:minute_rounded])
-      @accept_until[:MERIDIAN]==nil ? @accept_until[:MERIDIAN]=add.accept_meridian.selected_options[0].text : add.accept_meridian.select(@accept_until[:MERIDIAN])
+      @due[:MON]=get_or_select(@due[:MON], add.due_month)
+      @due[:year]=get_or_select(@due[:year], add.due_year)
+      @due[:day_of_month]=get_or_select(@due[:day_of_month], add.due_day)
+      @due[:hour]=get_or_select(@due[:hour], add.due_hour)
+      @due[:minute_rounded]=get_or_select(@due[:minute_rounded], add.due_minute)
+      @due[:MERIDIAN]=get_or_select(@due[:MERIDIAN], add.due_meridian)
+      @accept_until[:MON]=get_or_select(@accept_until[:MON], add.accept_month)
+      @accept_until[:year]=get_or_select(@accept_until[:year], add.accept_year)
+      @accept_until[:day_of_month]=get_or_select(@accept_until[:day_of_month], add.accept_day)
+      @accept_until[:hour]=get_or_select(@accept_until[:hour], add.accept_hour)
+      @accept_until[:minute_rounded]=get_or_select(@accept_until[:minute_rounded], add.accept_minute)
+      @accept_until[:MERIDIAN]=get_or_select(@accept_until[:MERIDIAN], add.accept_meridian)
       #@do_not_add_to_gradebook==nil ? @do_not_add_to_gradebook=radio_setting(add.do_not_add_gradebook.set?) :
       if @status=="Draft"
         add.save_draft
@@ -99,8 +99,8 @@ class AssignmentObject
   end
 
   def edit opts={}
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     on AssignmentsList do |list|
       if @status=="Draft"
         list.edit_assignment "Draft - #{@title}"
@@ -110,12 +110,12 @@ class AssignmentObject
     end
 
     on AssignmentAdd do |edit|
-      edit.title.set opts[:title] unless opts[:title]==nil
+      edit.title.fit opts[:title]
       unless opts[:instructions]==nil
         edit.enter_source_text edit.editor, opts[:instructions]
       end
-      edit.grade_scale.select opts[:grade_scale] unless opts[:grade_scale]==nil
-      edit.max_points.set opts[:max_points] unless opts[:max_points]==nil
+      edit.grade_scale.fit opts[:grade_scale]
+      edit.max_points.fit opts[:max_points]
 
       #TODO: All the rest goes here
 
@@ -140,8 +140,8 @@ class AssignmentObject
   end
 
   def get_info
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     on AssignmentsList do |list|
       @id = list.get_assignment_id @title
       @status=list.status_of @title
@@ -179,8 +179,8 @@ class AssignmentObject
   end
 
   def duplicate
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     reset
     on AssignmentsList do |list|
       list.duplicate @title
@@ -199,8 +199,8 @@ class AssignmentObject
   # Use this method to open a submitted assignment for viewing
   # the page.
   def view_submission
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     reset
     on AssignmentsList do |list|
       list.open_assignment @title

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

@@ -19,8 +19,8 @@ class AssignmentPermissionsObject # TODO: Need to add support for Group-specific
   end
     
   def set opts={}
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     reset
     on AssignmentsList do |list|
       list.permissions
@@ -43,8 +43,8 @@ class AssignmentPermissionsObject # TODO: Need to add support for Group-specific
   end
 
   def get
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     reset
     on AssignmentsList do |list|
       list.permissions

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

@@ -59,8 +59,8 @@ class AssignmentSubmissionObject
   end
 
   def grade_submission opts={}
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     reset
     on AssignmentsList do |list|
       list.grade @title
@@ -113,8 +113,8 @@ class AssignmentSubmissionObject
   end
 
   def open
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    assignments unless @browser.title=~/Assignments$/
+    open_my_site_by_name @site
+    assignments
     reset
     on AssignmentsList do |list|
       list.open_assignment @title

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

@@ -21,8 +21,8 @@ class BlogEntryObject
   end
     
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    blogs unless @browser.title=~/Blogs$/
+    open_my_site_by_name @site
+    blogs
     # TODO: More needed here
   end
     

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

@@ -21,8 +21,8 @@ class BloggerPostObject
   end
     
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    blogs unless @browser.title=~/Blogs$/
+    open_my_site_by_name @site
+    blogs
     # TODO: More needed here
   end
     
@@ -37,7 +37,7 @@ class BloggerPostObject
   def delete
     
   end
-  
+
 end
     
       

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

@@ -23,8 +23,8 @@ class ChatRoomObject
   end
     
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    chat_room unless @browser.title=~/Chat Room$/
+    open_my_site_by_name
+    chat_room
     on ChatRoom do |chat|
       chat.options
     end

data/lib/sambal-cle/data_objects/{site.rb → course.rb}

@@ -1,4 +1,4 @@
-class SiteObject
+class CourseSiteObject
 
   include Foundry
   include DataFactory
@@ -8,7 +8,7 @@ class SiteObject
 
   attr_accessor :name, :id, :subject, :course, :section, :term, :authorizer,
     :web_content_source, :email, :joiner_role, :creation_date, :web_content_title,
-    :description, :short_description, :site_contact_name, :site_contact_email
+    :description, :short_description, :site_contact_name, :site_contact_email, :participants
 
   def initialize(browser, opts={})
     @browser = browser
@@ -24,15 +24,16 @@ class SiteObject
       :joiner_role => "Student",
       :description => random_alphanums(30),
       :short_description => random_alphanums,
-      :site_contact_name => random_alphanums(5)+" "+random_alphanums(8)
+      :site_contact_name => random_alphanums(5)+" "+random_alphanums(8),
+      :participants=>{}
     }
     options = defaults.merge(opts)
     set_options(options)
   end
 
   def create
-    my_workspace unless @browser.title=~/My Workspace/
-    site_setup unless @browser.title=~/Site Setup/
+    my_workspace
+    site_setup
     on_page SiteSetup do |page|
       page.new
     end
@@ -92,7 +93,7 @@ class SiteObject
     end
 
     # Create a string that will match the new Site's "creation date" string
-    @creation_date = make_date(Time.now)
+    @creation_date = right_now[:sakai]
 
     on SiteSetup do |site_setup|
       site_setup.search(Regexp.escape(@subject))
@@ -104,8 +105,8 @@ class SiteObject
   end
 
   def create_and_reuse_site(site_name)
-    my_workspace unless @browser.title=~/My Workspace/
-    site_setup unless @browser.title=~/Site Setup/
+    my_workspace
+    site_setup
     on_page SiteSetup do |page|
       page.new
     end
@@ -216,7 +217,7 @@ class SiteObject
     }
     options = defaults.merge(opts)
 
-    new_site = make SiteObject, options
+    new_site = make CourseSiteObject, options
 
     new_site.name=options[:name]
     new_site.subject=options[:subject]
@@ -233,8 +234,8 @@ class SiteObject
     new_site.site_contact_email=options[:site_contact_email]
     new_site.term=options[:term]
 
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    site_editor unless @browser.title=~/Site Editor$/
+    open_my_site_by_name @site
+    site_editor
     on SiteEditor do |edit|
       edit.duplicate_site
     end
@@ -244,7 +245,7 @@ class SiteObject
       dupe.duplicate
     end
     my_workspace
-    site_setup unless @browser.title=~/Site Setup/
+    site_setup
     on SiteSetup do |sites|
       sites.search(Regexp.escape(new_site.name))
     end
@@ -256,20 +257,19 @@ class SiteObject
 
   end
 
-  # TODO: Improve this method to better take advantage of the UserObject...
-  def add_official_participants opts={}
-    participants = opts[:participants].join("\n")
-    open_my_site_by_name @name unless @browser.title=~/#{@name}/
-    site_editor unless @browser.title=~/Site Editor$/
+  def add_official_participants(role, *participants)
+    list_of_ids=participants.join("\n")
+    open_my_site_by_name @title
+    site_editor
     on SiteEditor do |site|
       site.add_participants
     end
     on SiteSetupAddParticipants do |add|
-      add.official_participants.set participants
+      add.official_participants.set list_of_ids
       add.continue
     end
     on SiteSetupChooseRole do |choose|
-      choose.radio_button(opts[:role]).set
+      choose.radio_button(role).set
       choose.continue
     end
     on SiteSetupParticipantEmail do |send|
@@ -278,7 +278,11 @@ class SiteObject
     on SiteSetupParticipantConfirm do |confirm|
       confirm.finish
     end
+    if @participants.has_key?(role)
+      @participants[role].insert(-1, participants).flatten!
+    else
+      @participants.store(role, participants)
+    end
   end
 
-
 end

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

@@ -30,8 +30,8 @@ class EventObject
   end
 
   def create
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    calendar unless @browser.title=~/Calendar$/
+    open_my_site_by_name @site
+    calendar
     on Calendar do |cal|
       cal.add_event
     end
@@ -63,8 +63,8 @@ class EventObject
   end
 
   def view
-    open_my_site_by_name @site unless @browser.title=~/#{@site}/
-    calendar unless @browser.title=~/Calendar$/
+    open_my_site_by_name @site
+    calendar
     on Calendar do |cal|
       cal.open_event @title
     end