1 files changed, 4 insertions, 30 deletions
diff --git a/test/unit/project_query_test.rb b/test/unit/project_query_test.rb
index 3e232f820..2b8c0ea8d 100644
--- a/test/unit/project_query_test.rb
+++ b/test/unit/project_query_test.rb
@@ -56,16 +56,9 @@ class ProjectQueryTest < ActiveSupport::TestCase
 
   def test_available_display_types_should_returns_bord_and_list
     query = ProjectQuery.new
-    query.admin_projects = nil
     assert_equal ['board', 'list'], query.available_display_types
   end
 
-  def test_available_display_types_should_always_returns_list_when_admin_projects_is_set
-    query = ProjectQuery.new
-    query.admin_projects = 1
-    assert_equal ['list'], query.available_display_types
-  end
-
   def test_display_type_default_should_equal_with_setting_project_list_display_type
     ProjectQuery.new.available_display_types.each do |t|
       with_settings :project_list_display_type => t do
@@ -81,8 +74,10 @@ class ProjectQueryTest < ActiveSupport::TestCase
     user_query = ProjectQuery.find(12)
     user_query.update(visibility: Query::VISIBILITY_PUBLIC)
 
-    [nil, user, User.anonymous].each do |u|
-      assert_nil IssueQuery.default(user: u)
+    with_settings :default_project_query => nil do
+      [nil, user, User.anonymous].each do |u|
+        assert_nil ProjectQuery.default(user: u)
+      end
     end
 
     # only global default is set
@@ -110,38 +105,17 @@ class ProjectQueryTest < ActiveSupport::TestCase
     assert_nil ProjectQuery.default
   end
 
-  def test_display_type_should_returns_list_when_admin_projects_is_set
-    q = ProjectQuery.new
-    q.admin_projects = 1
-    assert_equal 'list', q.display_type
-  end
-
   def test_project_statuses_values_should_equal_ancestors_return
     ancestor = Query.new
     q = ProjectQuery.new
     assert_equal ancestor.project_statuses_values, q.project_statuses_values
   end
 
-  def test_project_statuses_values_should_includes_project_status_archeved_when_admin_projects_is_set
-    q = ProjectQuery.new
-    q.admin_projects = 1
-    assert_includes q.project_statuses_values, [l(:project_status_archived), Project::STATUS_ARCHIVED.to_s]
-    Query.new.project_statuses_values.each do |status|
-      assert_includes q.project_statuses_values, status
-    end
-  end
-
   def test_base_scope_should_return_visible_projects
     q = ProjectQuery.new
     assert_equal Project.visible, q.base_scope
   end
 
-  def test_base_scope_should_return_all_projects_when_admin_projects_is_set
-    q = ProjectQuery.new
-    q.admin_projects = 1
-    assert_equal Project.all, q.base_scope
-  end
-
   def test_results_scope_has_last_activity_date
     q = ProjectQuery.generate!(column_names: [:last_activity_date])
     result_projects = q.results_scope({})