Actualiza el plugin Additionals a 3.0.2-master

plugins/additionals/test/functional/dashboard_async_blocks_controller_test.rb

@@ -1,20 +1,22 @@
 require File.expand_path '../../test_helper', __FILE__
 
 class DashboardAsyncBlocksControllerTest < Additionals::ControllerTest
-  fixtures :projects,
-           :users,
+  fixtures :projects, :users, :email_addresses, :user_preferences,
            :roles,
            :members,
            :member_roles,
            :issues,
+           :issue_relations,
            :issue_statuses,
            :versions,
            :trackers,
            :projects_trackers,
            :issue_categories,
            :enabled_modules,
+           :journals, :journal_details,
            :dashboards, :dashboard_roles,
-           :queries
+           :repositories, :changesets,
+           :queries, :watchers
 
   include Redmine::I18n
 

plugins/additionals/test/functional/dashboards_controller_test.rb

@@ -16,18 +16,30 @@ class DashboardsControllerTest < Additionals::ControllerTest
            :dashboards, :dashboard_roles,
            :queries
 
+  include CrudControllerBase
+
   def setup
     prepare_tests
-    @request.session[:user_id] = 2
-  end
 
-  def test_create
-    assert_difference 'Dashboard.count', 1 do
-      post :create,
-           params: { dashboard: { name: 'my test dashboard',
-                                  dashboard_type: DashboardContentWelcome::TYPE_NAME,
-                                  description: 'test desc',
-                                  author_id: 2 } }
-    end
+    User.current = nil
+    @user = users :users_002
+    @user_without_permission = users :users_004
+
+    @crud = { form: :dashboard,
+              show_assert_response: 406,
+              index_assert_response: 406,
+              create_params: { name: 'tester board',
+                               enable_sidebar: true,
+                               dashboard_type: DashboardContentWelcome::TYPE_NAME,
+                               author_id: @user.id },
+              create_assert_equals: { name: 'tester board' },
+              create_assert: %i[enable_sidebar],
+              edit_assert_select: ['form#dashboard-form'],
+              update_params: { name: 'changed',
+                               enable_sidebar: true },
+              update_assert_equals: { name: 'changed' },
+              update_assert: %i[enable_sidebar],
+              entity: dashboards(:private_welcome2),
+              delete_redirect_to: home_url }
   end
 end

plugins/additionals/test/functional/issues_controller_test.rb

@@ -80,6 +80,7 @@ class IssuesControllerTest < Additionals::ControllerTest
       @request.session[:user_id] = 2
       get :show,
           params: { id: 2 }
+
       assert_select 'a.assign-to-me'
     end
   end

plugins/additionals/test/functional/wiki_controller_test.rb

@@ -433,6 +433,27 @@ class WikiControllerTest < Additionals::ControllerTest
                   text: '#2 Add ingredients categories'
   end
 
+  def test_show_user_with_current_user
+    @request.session[:user_id] = WIKI_MACRO_USER_ID
+    @page.content.text = '{{user(current_user)}}'
+    @page.content.save!
+    get :show,
+        params: { project_id: 1, id: @page_name }
+    assert_response :success
+    assert_select '#content a.user.active[href=?]', '/users/2',
+                  text: 'John Smith'
+  end
+
+  def test_show_user_with_current_user_as_text
+    @request.session[:user_id] = WIKI_MACRO_USER_ID
+    @page.content.text = '{{user(current_user, text=true)}}'
+    @page.content.save!
+    get :show,
+        params: { project_id: 1, id: @page_name }
+    assert_response :success
+    assert_select '#content span.user.active', text: 'John Smith'
+  end
+
   def test_show_user_with_id
     @request.session[:user_id] = WIKI_MACRO_USER_ID
     @page.content.text = '{{user(1)}}'
@@ -440,7 +461,7 @@ class WikiControllerTest < Additionals::ControllerTest
     get :show,
         params: { project_id: 1, id: @page_name }
     assert_response :success
-    assert_select 'a[href=?]', '/users/1',
+    assert_select '#content a[href=?]', '/users/1',
                   text: 'Redmine Admin'
   end
 
@@ -451,8 +472,8 @@ class WikiControllerTest < Additionals::ControllerTest
     get :show,
         params: { project_id: 1, id: @page_name }
     assert_response :success
-    assert_select 'a.user', text: 'Redmine Admin'
-    assert_select 'a[href=?]', '/users/1',
+    assert_select '#content a.user', text: 'Redmine Admin'
+    assert_select '#content a[href=?]', '/users/1',
                   text: 'Redmine Admin'
   end
 
@@ -463,8 +484,8 @@ class WikiControllerTest < Additionals::ControllerTest
     get :show,
         params: { project_id: 1, id: @page_name }
     assert_response :success
-    assert_select 'a[href=?]', '/users/2',
-                  text: 'jsmith'
+    assert_select '#content a[href=?]', '/users/2',
+                  text: 'John Smith'
   end
 
   def test_show_user_with_name_fullname
@@ -474,8 +495,8 @@ class WikiControllerTest < Additionals::ControllerTest
     get :show,
         params: { project_id: 1, id: @page_name }
     assert_response :success
-    assert_select 'a.user', text: 'John Smith'
-    assert_select 'a[href=?]', '/users/2',
+    assert_select '#content a.user', text: 'John Smith'
+    assert_select '#content a[href=?]', '/users/2',
                   text: 'John Smith'
   end
 end