Merge pull request #1116 from travis-ci/dm_build_priority_feature_on_org

Build priority feature on an Organization.

Author: Shairyar Baig

lib/travis/api/v3/models/organization.rb

@@ -25,6 +25,10 @@ def builds
       Models::Build.where(owner_type: 'Organization', owner_id: id)
     end
 
+    def build_priorities_enabled?
+      Travis::Features.owner_active?(:build_priorities_org, self)
+    end
+
     alias members users
   end
 end

lib/travis/api/v3/permissions/build.rb

@@ -9,5 +9,9 @@ def cancel?
     def restart?
       restartable?
     end
+
+    def prioritize?
+      write? && build_priorities?
+    end
   end
 end

lib/travis/api/v3/permissions/generic.rb

@@ -75,5 +75,10 @@ def adminable?
       access_control.adminable? object
     end
 
+    def build_priorities?
+      return false if object.owner_type != 'Organization'
+      object.owner.build_priorities_enabled?
+    end
+
   end
 end

lib/travis/api/v3/renderer/owner.rb

@@ -5,7 +5,7 @@ class Renderer::Owner < ModelRenderer
     include Renderer::AvatarURL
 
     representation(:minimal,    :id, :login, :vcs_type)
-    representation(:standard,   :id, :login, :name, :github_id, :vcs_id, :vcs_type, :avatar_url, :education, :allow_migration, :allow_build_priorities)
+    representation(:standard,   :id, :login, :name, :github_id, :vcs_id, :vcs_type, :avatar_url, :education, :allow_migration)
     representation(:additional, :repositories, :installation)
 
     def initialize(*)
@@ -28,9 +28,5 @@ def installation
     def allow_migration
       !!Travis::Features.owner_active?(:allow_migration, @model)
     end
-
-    def allow_build_priorities
-      !!Travis::Features.owner_active?(:build_priorities_org, @model)
-    end
   end
 end

spec/v3/services/build/find_spec.rb

@@ -5,6 +5,7 @@
   let(:stages) { build.stages }
   let(:jobs)   { Travis::API::V3::Models::Build.find(build.id).jobs }
   let(:parsed_body) { JSON.load(body) }
+  let(:org) { Travis::API::V3::Models::Organization.new(login: 'example-org') }
 
   before do
     build.update_attributes(sender_id: repo.owner.id, sender_type: 'User')
@@ -42,7 +43,8 @@
       "@permissions"        => {
         "read"              => true,
         "cancel"            => false,
-        "restart"           => false},
+        "restart"           => false,
+        "prioritize"        => false},
       "id"                  => build.id,
       "number"              => build.number,
       "state"               => build.state,
@@ -140,7 +142,8 @@
       "@permissions"        => {
         "read"              => true,
         "cancel"            => true,
-        "restart"           => true},
+        "restart"           => true,
+        "prioritize"        => false},
       "id"                  => build.id,
       "number"              => build.number,
       "state"               => build.state,
@@ -230,7 +233,8 @@
       "@permissions"        => {
         "read"              => true,
         "cancel"            => false,
-        "restart"           => false},
+        "restart"           => false,
+        "prioritize"        => false},
       "id"                  => build.id,
       "number"              => build.number,
       "state"               => build.state,

spec/v3/services/builds/find_spec.rb

@@ -66,7 +66,8 @@
         "@permissions"        => {
           "read"              => true,
           "cancel"            => false,
-          "restart"           => false },
+          "restart"           => false,
+          "prioritize"        => false },
         "id"                  => build.id,
         "number"              => "3",
         "state"               => "configured",
@@ -184,7 +185,8 @@
         "@permissions"        => {
           "read"              => true,
           "cancel"            => false,
-          "restart"           => false },
+          "restart"           => false,
+          "prioritize"        => false},
         "id"                  => build.id,
         "number"              => "3",
         "state"               => "configured",
@@ -306,7 +308,8 @@
         "@permissions"        => {
           "read"              => true,
           "cancel"            => true,
-          "restart"           => true },
+          "restart"           => true,
+          "prioritize"        => false },
         "id"                  => build.id,
         "number"              => "3",
         "state"               => "configured",

spec/v3/services/builds/for_current_user_spec.rb

@@ -48,7 +48,8 @@
         "@permissions"        => {
           "read"              => true,
           "cancel"            => false,
-          "restart"           => false },
+          "restart"           => false,
+          "prioritize"        => false },
         "id"                  => build.id,
         "number"              => "3",
         "state"               => "configured",

spec/v3/services/installation/find_spec.rb

@@ -56,7 +56,6 @@
         "synced_at" => nil,
         "education" => nil,
         "allow_migration" => false,
-        "allow_build_priorities" => false,
         "recently_signed_up" => false,
         "secure_user_hash" => nil,
       }

spec/v3/services/organization/find_spec.rb

@@ -23,7 +23,6 @@
       "avatar_url"       => nil,
       "education"        => false,
       "allow_migration"  => false,
-      "allow_build_priorities" => false,
     }}
   end
 
@@ -53,7 +52,6 @@
       "avatar_url"       => nil,
       "education"        => true,
       "allow_migration"  => true,
-      "allow_build_priorities" => true,
     }}
   end
 

spec/v3/services/organizations/for_current_user_spec.rb

@@ -59,7 +59,6 @@
         "avatar_url"      => nil,
         "education"       => false,
         "allow_migration" => false,
-        "allow_build_priorities" => false,
       }]
     }}
   end