comparison test/integration/api_test/roles_test.rb @ 1526:404aa68d4227

Merge from live branch

 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2014  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.

 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require File.expand_path('../../../test_helper', __FILE__)
 
-class ApiTest::RolesTest < ActionController::IntegrationTest
+class Redmine::ApiTest::RolesTest < Redmine::ApiTest::Base
   fixtures :roles
 
   def setup
     Setting.rest_api_enabled = '1'
   end
 
-  context "/roles" do
-    context "GET" do
-      context "xml" do
-        should "return the roles" do
-          get '/roles.xml'
+  test "GET /roles.xml should return the roles" do
+    get '/roles.xml'
 
-          assert_response :success
-          assert_equal 'application/xml', @response.content_type
-          assert_equal 3, assigns(:roles).size
+    assert_response :success
+    assert_equal 'application/xml', @response.content_type
+    assert_equal 3, assigns(:roles).size
 
-          assert_tag :tag => 'roles',
-            :attributes => {:type => 'array'},
-            :child => {
-              :tag => 'role',
-              :child => {
-                :tag => 'id',
-                :content => '2',
-                :sibling => {
-                  :tag => 'name',
-                  :content => 'Developer'
-                }
-              }
-            }
-        end
-      end
-
-      context "json" do
-        should "return the roles" do
-          get '/roles.json'
-
-          assert_response :success
-          assert_equal 'application/json', @response.content_type
-          assert_equal 3, assigns(:roles).size
-
-          json = ActiveSupport::JSON.decode(response.body)
-          assert_kind_of Hash, json
-          assert_kind_of Array, json['roles']
-          assert_include({'id' => 2, 'name' => 'Developer'}, json['roles'])
-        end
-      end
-    end
+    assert_tag :tag => 'roles',
+      :attributes => {:type => 'array'},
+      :child => {
+        :tag => 'role',
+        :child => {
+          :tag => 'id',
+          :content => '2',
+          :sibling => {
+            :tag => 'name',
+            :content => 'Developer'
+          }
+        }
+      }
   end
 
-  context "/roles/:id" do
-    context "GET" do
-      context "xml" do
-        should "return the role" do
-          get '/roles/1.xml'
+  test "GET /roles.json should return the roles" do
+    get '/roles.json'
 
-          assert_response :success
-          assert_equal 'application/xml', @response.content_type
+    assert_response :success
+    assert_equal 'application/json', @response.content_type
+    assert_equal 3, assigns(:roles).size
 
-          assert_select 'role' do
-            assert_select 'name', :text => 'Manager'
-            assert_select 'role permissions[type=array]' do
-              assert_select 'permission', Role.find(1).permissions.size
-              assert_select 'permission', :text => 'view_issues'
-            end
-          end
-        end
+    json = ActiveSupport::JSON.decode(response.body)
+    assert_kind_of Hash, json
+    assert_kind_of Array, json['roles']
+    assert_include({'id' => 2, 'name' => 'Developer'}, json['roles'])
+  end
+
+  test "GET /roles/:id.xml should return the role" do
+    get '/roles/1.xml'
+
+    assert_response :success
+    assert_equal 'application/xml', @response.content_type
+
+    assert_select 'role' do
+      assert_select 'name', :text => 'Manager'
+      assert_select 'role permissions[type=array]' do
+        assert_select 'permission', Role.find(1).permissions.size
+        assert_select 'permission', :text => 'view_issues'
       end
     end
   end
 end