[webui] move the rest of the webui/projects_controller

openSUSE · Oct 22, 2013 · 097de39 · 097de39
1 parent b3d2834
commit 097de39
Show file tree

Hide file tree

Showing 8 changed files with 296 additions and 403 deletions.
diff --git a/src/api/app/controllers/webui/projects_controller.rb b/src/api/app/controllers/webui/projects_controller.rb
diff --git a/src/api/config/routes.rb b/src/api/config/routes.rb
@@ -332,11 +332,7 @@
     #       DO NOT USE THEM IN YOUR TOOLS!
     #
     namespace :webui do
-      resources :projects, :only => [:index], constraints: { :id => %r{[^\/]*} } do
-        member do
-          get 'infos'
-          get 'status'
-        end
+      resources :projects, constraints: { :id => %r{[^\/]*} } do
         resources :flags, :only => [:index]
         resources :packages, :only => [], constraints: { :id => %r{[^\/]*} } do
           resources :relationships, :only => [:create] do

diff --git a/src/api/test/functional/webui_controller_test.rb b/src/api/test/functional/webui_controller_test.rb
@@ -9,34 +9,6 @@ def setup
     wait_for_scheduler_start
   end
 
-  def test_project_infos
-    get '/webui/projects/home:Iggy/infos'
-    assert_response 401
-
-    login_Iggy
-    get '/webui/projects/home:Iggy/infos'
-    assert_response :success
-
-  end
-
-  def test_remote_projects
-    get "/webui/projects/remotes"
-    assert_response 401
-
-    login_Iggy
-    get "/webui/projects/remotes"
-    assert_response :success
-    assert_match(/RemoteInstance/, @response.body)
-  end
-
-  def test_remote_projects_as_admin
-    login_king
-    get "/webui/projects/remotes"
-    assert_response :success
-    assert_match(/RemoteInstance/, @response.body)
-    assert_match(/Remoteurl project which is hidden/, @response.body)
-  end
-
   def test_search_owner
     login_king
 
@@ -100,13 +72,6 @@ def test_search_owner
     assert_response :success
   end
 
-  test 'project status' do
-    login_Iggy
-
-    get '/webui/projects/LocalProject/status?limit_to_fails=true&limit_to_old=false&include_versions=true&ignore_pending=false&filter_devel=_all_'
-    assert_response :success
-  end
-
   test 'package rdiff' do
     login_Iggy
 

diff --git a/src/api/test/unit/code_quality_test.rb b/src/api/test/unit/code_quality_test.rb
@@ -150,7 +150,6 @@ def setup
       'UserLdapStrategy::initialize_ldap_con' => 64.05,
       'UserLdapStrategy::render_grouplist_ldap' => 100.3,
       'UserLdapStrategy::update_entry_ldap' => 59.56,
-      'Webui::ProjectsController#status_check_package' => 200,
       'WizardController#package_wizard' => 135.16,
   }