From eb0eab596703bc320ee7f67e6c2aac62f4628c9f Mon Sep 17 00:00:00 2001
From: Joe Corcoran <joe@corcoran.io>
Date: Wed, 8 Jun 2016 17:18:24 +0200
Subject: [PATCH] Move settings to top level of response

To better accommodate nested responses.
---
 lib/travis/api/v3/renderer/settings.rb |  6 ++----
 spec/v3/services/settings_spec.rb      | 30 +++++++++++---------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/lib/travis/api/v3/renderer/settings.rb b/lib/travis/api/v3/renderer/settings.rb
index 87ad2b8c..b27a8aa7 100644
--- a/lib/travis/api/v3/renderer/settings.rb
+++ b/lib/travis/api/v3/renderer/settings.rb
@@ -9,10 +9,8 @@ module Travis::API::V3
     end
 
     def render(settings, **)
-      {
-        :@type => 'settings'.freeze,
-        :settings => settings.to_h
-      }
+      response = { '@type' => 'settings'.freeze }
+      response.merge(settings.to_h)
     end
   end
 end
diff --git a/spec/v3/services/settings_spec.rb b/spec/v3/services/settings_spec.rb
index c193a7ec..f1c93ff9 100644
--- a/spec/v3/services/settings_spec.rb
+++ b/spec/v3/services/settings_spec.rb
@@ -40,12 +40,10 @@ describe Travis::API::V3::Services::Settings do
       example do
         expect(JSON.load(body)).to eq(
           '@type' => 'settings',
-          'settings' => {
-            'builds_only_with_travis_yml' => false,
-            'build_pushes' => true,
-            'build_pull_requests' => true,
-            'maximum_number_of_builds' => 0
-          }
+          'builds_only_with_travis_yml' => false,
+          'build_pushes' => true,
+          'build_pull_requests' => true,
+          'maximum_number_of_builds' => 0
         )
       end 
     end
@@ -60,12 +58,10 @@ describe Travis::API::V3::Services::Settings do
       example do
         expect(JSON.load(body)).to eq(
           '@type' => 'settings',
-          'settings' => {
-            'builds_only_with_travis_yml' => false,
-            'build_pushes' => false,
-            'build_pull_requests' => true,
-            'maximum_number_of_builds' => 0
-          }
+          'builds_only_with_travis_yml' => false,
+          'build_pushes' => false,
+          'build_pull_requests' => true,
+          'maximum_number_of_builds' => 0
         )
       end 
     end
@@ -115,12 +111,10 @@ describe Travis::API::V3::Services::Settings do
       example do
         expect(JSON.load(body)).to eq(
           '@type' => 'settings',
-          'settings' => {
-            'builds_only_with_travis_yml' => false,
-            'build_pushes' => false,
-            'build_pull_requests' => true,
-            'maximum_number_of_builds' => 20
-          }
+          'builds_only_with_travis_yml' => false,
+          'build_pushes' => false,
+          'build_pull_requests' => true,
+          'maximum_number_of_builds' => 20
         )
       end 
     end