Removed test contexts.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10406 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/integration/api_test/attachments_test.rb

@@ -37,9 +37,7 @@ class ApiTest::AttachmentsTest < ActionController::IntegrationTest
     set_tmp_attachments_directory
   end
 
-  context "/attachments/:id" do
+  test "GET /attachments/:id.xml should return the attachment" do
-    context "GET" do
-      should "return the attachment" do
     get '/attachments/7.xml', {}, credentials('jsmith')
     assert_response :success
     assert_equal 'application/xml', @response.content_type
@@ -58,38 +56,32 @@ class ApiTest::AttachmentsTest < ActionController::IntegrationTest
       }
   end
 
-      should "deny access without credentials" do
+  test "GET /attachments/:id.xml should deny access without credentials" do
     get '/attachments/7.xml'
     assert_response 401
     set_tmp_attachments_directory
   end
-    end
-  end
 
-  context "/attachments/download/:id/:filename" do
+  test "GET /attachments/download/:id/:filename should return the attachment content" do
-    context "GET" do
-      should "return the attachment content" do
     get '/attachments/download/7/archive.zip', {}, credentials('jsmith')
     assert_response :success
     assert_equal 'application/octet-stream', @response.content_type
     set_tmp_attachments_directory
   end
 
-      should "deny access without credentials" do
+  test "GET /attachments/download/:id/:filename should deny access without credentials" do
     get '/attachments/download/7/archive.zip'
     assert_response 302
     set_tmp_attachments_directory
   end
-    end
-  end
 
-  context "POST /uploads" do
+  test "POST /uploads.xml should return the token" do
-    should "return the token" do
     set_tmp_attachments_directory
     assert_difference 'Attachment.count' do
       post '/uploads.xml', 'File content', {"CONTENT_TYPE" => 'application/octet-stream'}.merge(credentials('jsmith'))
       assert_response :created
       assert_equal 'application/xml', response.content_type
+    end
 
     xml = Hash.from_xml(response.body)
     assert_kind_of Hash, xml['upload']
@@ -107,9 +99,8 @@ class ApiTest::AttachmentsTest < ActionController::IntegrationTest
     assert File.exist?(attachment.diskfile)
     assert_equal 'File content', File.read(attachment.diskfile)
   end
-    end
 
-    should "not accept other content types" do
+  test "POST /uploads.xml should not accept other content types" do
     set_tmp_attachments_directory
     assert_no_difference 'Attachment.count' do
       post '/uploads.xml', 'PNG DATA', {"CONTENT_TYPE" => 'image/png'}.merge(credentials('jsmith'))
@@ -117,7 +108,7 @@ class ApiTest::AttachmentsTest < ActionController::IntegrationTest
     end
   end
 
-    should "return errors if file is too big" do
+  test "POST /uploads.xml should return errors if file is too big" do
     set_tmp_attachments_directory
     with_settings :attachment_max_size => 1 do
       assert_no_difference 'Attachment.count' do
@@ -128,4 +119,3 @@ class ApiTest::AttachmentsTest < ActionController::IntegrationTest
     end
   end
 end
-end