Remove hidden comments test from controller tests

[rails.git] / app / abilities / api_ability.rb

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 80245eeaa34882e6acd71d3930436b5d9d13f4d1..0eae46f824294aab6a703987cc80a3d2091c9768 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -5,15 +5,13 @@ class ApiAbility
 
   def initialize(user)
     can :show, :capability
 
   def initialize(user)
     can :show, :capability

-    can :index, :change

     can :index, :map
     can :show, :permission
     can :index, :map
     can :show, :permission

-    can [:search_all, :search_nodes, :search_ways, :search_relations], :search

     can :show, :version
 
     if Settings.status != "database_offline"
       can [:show, :download, :query], Changeset
     can :show, :version
 
     if Settings.status != "database_offline"
       can [:show, :download, :query], Changeset

-      can [:index, :create, :comment, :feed, :show, :search], Note
+      can [:index, :create, :feed, :show, :search], Note

       can :index, Tracepoint
       can [:index, :show], User
       can [:index, :show], Node
       can :index, Tracepoint
       can [:index, :show], User
       can [:index, :show], Node


@@ -22,23 +20,16 @@ class ApiAbility
       can [:history, :version], OldNode
       can [:history, :version], OldWay
       can [:history, :version], OldRelation
       can [:history, :version], OldNode
       can [:history, :version], OldWay
       can [:history, :version], OldRelation

-    end
-
-    if user
-      can :welcome, :site
-      can [:revoke, :authorize], :oauth
+      can [:show], UserBlock

 
 

-      if Settings.status != "database_offline"
-        can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
-        can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
-        can [:close, :reopen], Note
-        can [:new, :create], Report
+      if user&.active?
+        can [:comment, :close, :reopen], Note

         can [:create, :show, :update, :destroy, :data], Trace
         can [:details, :gpx_files], User
         can [:create, :show, :update, :destroy, :data], Trace
         can [:details, :gpx_files], User

-        can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
+        can [:index, :show, :update, :update_all, :destroy], UserPreference

 
         if user.terms_agreed?
 
         if user.terms_agreed?

-          can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
+          can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset

           can :create, ChangesetComment
           can [:create, :update, :delete], Node
           can [:create, :update, :delete], Way
           can :create, ChangesetComment
           can [:create, :update, :delete], Node
           can [:create, :update, :delete], Way