Merge pull request #968 from DeterminateSystems/unnecessary-declarative-field

Projects: don't respond with unnecessary declarative field

src/lib/Hydra/Schema/Projects.pm

@@ -263,15 +263,19 @@ sub as_json {
         "enabled" => $self->get_column("enabled") ? JSON::true : JSON::false,
         "hidden" => $self->get_column("hidden") ? JSON::true : JSON::false,
 
+        "jobsets" => [ map { $_->name } $self->jobsets ]
+    );
+
+    my %decl = (
         "declarative" => {
             "file" => $self->get_column("declfile") // "",
             "type" => $self->get_column("decltype") // "",
             "value" => $self->get_column("declvalue") // ""
-        },
+        }
-
-        "jobsets" => [ map { $_->name } $self->jobsets ]
     );
 
+    %json = (%json, %decl) if !($decl{"declarative"}->{"file"} eq "");
+
     return \%json;
 }
 

t/Controller/projects.t

@@ -49,12 +49,7 @@ subtest "Read project 'tests'" => sub {
         homepage => "",
         jobsets => [],
         name => "tests",
-        owner => "root",
+        owner => "root"
-        declarative => {
-            file => "",
-            type => "",
-            value => ""
-        }
     });
 };
 
@@ -136,12 +131,7 @@ subtest "Transitioning from declarative project to normal" => sub {
             homepage => "",
             jobsets => [],
             name => "tests",
-            owner => "root",
+            owner => "root"
-            declarative => {
-                file => "",
-                type => "",
-                value => ""
-            }
         });
     };
 };