1 files changed, 7 insertions, 6 deletions
diff --git a/test/functional/imports_controller_test.rb b/test/functional/imports_controller_test.rb
index 526e9e874..3b271b0ce 100644
--- a/test/functional/imports_controller_test.rb
+++ b/test/functional/imports_controller_test.rb
@@ -44,7 +44,6 @@ class ImportsControllerTest < Redmine::ControllerTest
   def test_new_should_display_the_upload_form
     get :new
     assert_response :success
-    assert_template 'new'
     assert_select 'input[name=?]', 'file'
   end
 
@@ -62,7 +61,10 @@ class ImportsControllerTest < Redmine::ControllerTest
     import = generate_import
     get :settings, :id => import.to_param
     assert_response :success
-    assert_template 'settings'
+    assert_select 'select[name=?]', 'import_settings[separator]'
+    assert_select 'select[name=?]', 'import_settings[wrapper]'
+    assert_select 'select[name=?]', 'import_settings[encoding]'
+    assert_select 'select[name=?]', 'import_settings[date_format]'
   end
 
   def test_post_settings_should_update_settings
@@ -107,7 +109,6 @@ class ImportsControllerTest < Redmine::ControllerTest
 
     get :mapping, :id => import.to_param
     assert_response :success
-    assert_template 'mapping'
 
     assert_select 'select[name=?]', 'import_settings[mapping][subject]' do
       assert_select 'option', 4
@@ -139,7 +140,7 @@ class ImportsControllerTest < Redmine::ControllerTest
 
     get :run, :id => import
     assert_response :success
-    assert_template 'run'
+    assert_select '#import-progress'
   end
  
   def test_post_run_should_import_the_file
@@ -183,7 +184,7 @@ class ImportsControllerTest < Redmine::ControllerTest
 
     get :show, :id => import.to_param
     assert_response :success
-    assert_template 'show'
+
     assert_select 'ul#saved-items'
     assert_select 'ul#saved-items li', import.saved_items.count
     assert_select 'table#unsaved-items', 0
@@ -197,7 +198,7 @@ class ImportsControllerTest < Redmine::ControllerTest
 
     get :show, :id => import.to_param
     assert_response :success
-    assert_template 'show'
+
     assert_select 'table#unsaved-items'
     assert_select 'table#unsaved-items tbody tr', import.unsaved_items.count
   end