Makes custom queries available through the REST API (#5737).

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

3 files changed, 68 insertions, 0 deletions

diff --git a/test/integration/api_test/queries_test.rb b/test/integration/api_test/queries_test.rb
new file mode 100644
index 000000000..154472e19
--- /dev/null
+++ b/test/integration/api_test/queries_test.rb
@@ -0,0 +1,55 @@
+# Redmine - project management software
+# Copyright (C) 2006-2011  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.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# 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::QueriesTest < ActionController::IntegrationTest
+  fixtures :all
+
+  def setup
+    Setting.rest_api_enabled = '1'
+  end
+
+  context "/queries" do
+    context "GET" do
+      
+      should "return queries" do
+        get '/queries.xml'
+        
+        assert_response :success
+        assert_equal 'application/xml', @response.content_type
+        assert_tag :tag => 'queries',
+          :attributes => {:type => 'array'},
+          :child => {
+            :tag => 'query',
+            :child => {
+              :tag => 'id',
+              :content => '4',
+              :sibling => {
+                :tag => 'name',
+                :content => 'Public query for all projects'
+              }
+            }
+          }
+      end
+    end
+  end
+  
+  def credentials(user, password=nil)
+    ActionController::HttpAuthentication::Basic.encode_credentials(user, password || user)
+  end
+end
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index c78f4082b..d25ed3d73 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -210,6 +210,9 @@ class RoutingTest < ActionController::IntegrationTest
   end
   
   context "queries" do
+    should_route :get, "/queries.xml", :controller => 'queries', :action => 'index', :format => 'xml'
+    should_route :get, "/queries.json", :controller => 'queries', :action => 'index', :format => 'json'
+    
     should_route :get, "/queries/new", :controller => 'queries', :action => 'new'
     should_route :get, "/projects/redmine/queries/new", :controller => 'queries', :action => 'new', :project_id => 'redmine'
     
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 27a0a37e7..646e4099f 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -417,6 +417,16 @@ class QueryTest < ActiveSupport::TestCase
     assert !q.editable_by?(manager)
     assert !q.editable_by?(developer)
   end
+  
+  def test_visible_scope
+    query_ids = Query.visible(User.anonymous).map(&:id)
+    
+    assert query_ids.include?(1), 'public query on public project was not visible'
+    assert query_ids.include?(4), 'public query for all projects was not visible'
+    assert !query_ids.include?(2), 'private query on public project was visible'
+    assert !query_ids.include?(3), 'private query for all projects was visible'
+    assert !query_ids.include?(7), 'public query on private project was visible'
+  end
 
   context "#available_filters" do
     setup do