Update test code. (r-labs issueId: 1366)

Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 group :test do
   gem 'simplecov-rcov', :require => false
+  gem 'shoulda', groups: [:test]
 end

app/controllers/global_issue_templates_controller.rb

@@ -14,7 +14,7 @@ class GlobalIssueTemplatesController < ApplicationController
   def index
     @trackers = Tracker.all
     @global_issue_templates = GlobalIssueTemplate.all
-    render :template => 'global_issue_templates/index.html.erb', :layout => !request.xhr?
+    render :layout => !request.xhr?
   end
 
   def new

app/controllers/issue_templates_controller.rb

@@ -43,7 +43,7 @@ class IssueTemplatesController < ApplicationController
 
     @globalIssueTemplates = GlobalIssueTemplate.joins(:projects).where(["projects.id = ?", @project.id])
 
-    render :template => 'issue_templates/index.html.erb', :layout => !request.xhr?
+    render :layout => !request.xhr?
   end
 
   def show

app/models/global_issue_template.rb

@@ -17,8 +17,10 @@ class GlobalIssueTemplate < ActiveRecord::Base
                   'note',
                   'enabled',
                   'issue_title',
-                  'project_ids'
+                  'project_ids',
-  attr_accessible :title, :tracker_id, :issue_title, :description, :note, :enabled, :project_ids
+                  'position'
+  attr_accessible :title, :tracker_id, :issue_title, :description, :note,
+                  :enabled, :project_ids, :position, :author
 
   def enabled?
     self.enabled == true

app/models/issue_template.rb

@@ -13,9 +13,9 @@ class IssueTemplate < ActiveRecord::Base
   
   # author and project should be stable.
   safe_attributes 'title', 'description', 'tracker_id', 'note', 'enabled', 'issue_title','is_default',
-                  'enabled_sharing','visible_children'
+                  'enabled_sharing','visible_children', 'position'
   attr_accessible :title, :tracker_id, :issue_title, :description, :note,
-                  :is_default, :enabled, :enabled_sharing, :author, :project
+                  :is_default, :enabled, :enabled_sharing, :author, :project, :position
   def enabled?
     self.enabled == true
   end

test/functional/global_issue_templates_controller_test.rb

@@ -62,7 +62,7 @@ class GlobalIssueTemplatesControllerTest < ActionController::TestCase
       end
 
       should "return new global template instance when request is get" do
-        get :new, :author_id => 1
+        get :new
         assert_response :success
 
         template = assigns(:global_issue_template)
@@ -76,16 +76,16 @@ class GlobalIssueTemplatesControllerTest < ActionController::TestCase
 
       # do post
       should "insert new global template record when request is post" do
-        count = GlobalIssueTemplate.find(:all).length
+        num = GlobalIssueTemplate.count
         post :new, :global_issue_template => {:title => "Global Template newtitle for creation test", :note => "Global note for creation test",
                                        :description => "Global Template description for creation test",
                                        :tracker_id => 1, :enabled => 1, :author_id => 1
         }
 
-        template = GlobalIssueTemplate.first(:order => 'id DESC')
+        template = GlobalIssueTemplate.order('id DESC').first
         assert_response :redirect # show
 
-        assert_equal(count + 1, GlobalIssueTemplate.find(:all).length)
+        assert_equal(num + 1, GlobalIssueTemplate.count)
 
         assert_not_nil template
         assert_equal("Global Template newtitle for creation test", template.title)
@@ -97,7 +97,7 @@ class GlobalIssueTemplatesControllerTest < ActionController::TestCase
 
       # fail check
       should "not be able to save if title is empty" do
-        count = GlobalIssueTemplate.find(:all).length
+        num = GlobalIssueTemplate.count
 
         # when title blank, validation bloks to save.
         post :new, :global_issue_template => {:title => "", :note => "note",
@@ -105,7 +105,7 @@ class GlobalIssueTemplatesControllerTest < ActionController::TestCase
                                        :author_id => 1 }
 
         assert_response :success
-        assert_equal(count, GlobalIssueTemplate.find(:all).length)
+        assert_equal(num, GlobalIssueTemplate.count)
       end
 
       should "preview template" do

test/functional/issue_templates_controller_test.rb

@@ -104,15 +104,15 @@ class IssueTemplatesControllerTest < ActionController::TestCase
 
       # do post
       should "insert new template record when request is post" do
-        count = IssueTemplate.find(:all).length
+        num = IssueTemplate.count
         post :new, :issue_template => {:title => "newtitle", :note => "note", 
           :description => "description", :tracker_id => 1, :enabled => 1, :author_id => 3 
           }, :project_id => 1
 
-        template = IssueTemplate.first(:order => 'id DESC')
+        template = assigns(:issue_template)
         assert_response :redirect # show
 
-        assert_equal(count + 1, IssueTemplate.find(:all).length)
+        assert_equal(num + 1, IssueTemplate.count)
 
         assert_not_nil template
         assert_equal("newtitle", template.title)
@@ -125,7 +125,7 @@ class IssueTemplatesControllerTest < ActionController::TestCase
 
       # fail check
       should "not be able to save if title is empty" do
-        count = IssueTemplate.find(:all).length
+        num = IssueTemplate.count
 
         # when title blank, validation bloks to save.
         post :new, :issue_template => {:title => "", :note => "note", 
@@ -133,7 +133,7 @@ class IssueTemplatesControllerTest < ActionController::TestCase
           :author_id => 1 }, :project_id => 1
 
         assert_response :success
-        assert_equal(count, IssueTemplate.find(:all).length)
+        assert_equal(num, IssueTemplate.count)
       end
 
       should "preview template" do