@@ -44,6 +44,12 @@ def course_copy_helper(dont_submit_form=false)
4444 @course . reload
4545 end
4646
47+ def validate_course_main_page
48+ header = f ( '#section-tabs-header' )
49+ header . should be_displayed
50+ header . text . should == @course . course_code
51+ end
52+
4753 def upload_helper ( import_quiz = false )
4854 if import_quiz
4955 expect_new_page_load { fj ( '.content-imports-instructions a:last' ) . click }
@@ -57,13 +63,18 @@ def upload_helper(import_quiz = false)
5763 f ( '#zip_file' ) . send_keys ( fullpath )
5864 submit_form ( '#zip_file_import_form' )
5965 keep_trying_until { Delayed ::Job . count > 0 }
60- Delayed ::Job . last . invoke_job
61- back_button = keep_trying_until do
62- back_button = f ( '.back_to_course' )
63- back_button . should_not be_nil
64- back_button
66+ expect_new_page_load { Delayed ::Job . last . invoke_job }
67+ if defined? ( QTI ) != nil && QTI . qti_enabled?
68+ back_button = keep_trying_until do
69+ back_button = f ( '.back_to_course' )
70+ back_button . should_not be_nil
71+ back_button
72+ expect_new_page_load { back_button . click }
73+ end
74+ validate_course_main_page
75+ else
76+ validate_course_main_page
6577 end
66- expect_new_page_load { back_button . click }
6778 folder = Folder . root_folders ( @course ) . first
6879 folder . attachments . active . map ( &:display_name ) . should == [ "first_entry.txt" ]
6980 folder . sub_folders . active . count . should == 1
@@ -264,7 +275,7 @@ def upload_helper(import_quiz = false)
264275
265276 describe "course file imports" do
266277 before ( :each ) do
267- course_with_teacher_logged_in
278+ course_with_teacher_logged_in ( :course_code => 'first files course' )
268279 @second_course = Course . create! ( :name => 'second files course' )
269280 @second_course . offer!
270281 @second_course . enroll_teacher ( @user ) . accept!
0 commit comments