diff options
author | Matthew Holt <mholt@users.noreply.github.com> | 2019-11-04 12:05:20 -0700 |
---|---|---|
committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-11-04 12:05:20 -0700 |
commit | 35f70c98fa1ea13882ee4f0406cd17f5545d0100 (patch) | |
tree | 71d8a35e62910802431cc4c650da7365ac21041f /dynamicconfig_test.go | |
parent | fb06c041c4be4eb32f18d54e8e7feff8dd76b0e9 (diff) |
core: Major refactor of admin endpoint and config handling
Fixed several bugs and made other improvements. All config changes are
now mediated by the global config state manager. It used to be that
initial configs given at startup weren't tracked, so you could start
caddy with --config caddy.json and then do a GET /config/ and it would
return null. That is fixed, along with several other general flow/API
enhancements, with more to come.
Diffstat (limited to 'dynamicconfig_test.go')
-rw-r--r-- | dynamicconfig_test.go | 123 |
1 files changed, 0 insertions, 123 deletions
diff --git a/dynamicconfig_test.go b/dynamicconfig_test.go deleted file mode 100644 index 372c756..0000000 --- a/dynamicconfig_test.go +++ /dev/null @@ -1,123 +0,0 @@ -// Copyright 2015 Matthew Holt and The Caddy Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package caddy - -import ( - "encoding/json" - "net/http" - "net/http/httptest" - "reflect" - "strings" - "testing" -) - -func TestMutateConfig(t *testing.T) { - // each test is performed in sequence, so - // each change builds on the previous ones; - // the config is not reset between tests - for i, tc := range []struct { - method string - path string // rawConfigKey will be prepended - payload string - expect string // JSON representation of what the whole config is expected to be after the request - shouldErr bool - }{ - { - method: "POST", - path: "", - payload: `{"foo": "bar", "list": ["a", "b", "c"]}`, // starting value - expect: `{"foo": "bar", "list": ["a", "b", "c"]}`, - }, - { - method: "POST", - path: "/foo", - payload: `"jet"`, - expect: `{"foo": "jet", "list": ["a", "b", "c"]}`, - }, - { - method: "POST", - path: "/bar", - payload: `{"aa": "bb", "qq": "zz"}`, - expect: `{"foo": "jet", "bar": {"aa": "bb", "qq": "zz"}, "list": ["a", "b", "c"]}`, - }, - { - method: "DELETE", - path: "/bar/qq", - expect: `{"foo": "jet", "bar": {"aa": "bb"}, "list": ["a", "b", "c"]}`, - }, - { - method: "POST", - path: "/list", - payload: `"e"`, - expect: `{"foo": "jet", "bar": {"aa": "bb"}, "list": ["a", "b", "c", "e"]}`, - }, - { - method: "PUT", - path: "/list/3", - payload: `"d"`, - expect: `{"foo": "jet", "bar": {"aa": "bb"}, "list": ["a", "b", "c", "d", "e"]}`, - }, - { - method: "DELETE", - path: "/list/3", - expect: `{"foo": "jet", "bar": {"aa": "bb"}, "list": ["a", "b", "c", "e"]}`, - }, - { - method: "PATCH", - path: "/list/3", - payload: `"d"`, - expect: `{"foo": "jet", "bar": {"aa": "bb"}, "list": ["a", "b", "c", "d"]}`, - }, - } { - req, err := http.NewRequest(tc.method, rawConfigKey+tc.path, strings.NewReader(tc.payload)) - if err != nil { - t.Fatalf("Test %d: making test request: %v", i, err) - } - req.Header.Set("Content-Type", "application/json") - - w := httptest.NewRecorder() - - err = mutateConfig(w, req) - - if tc.shouldErr && err == nil { - t.Fatalf("Test %d: Expected error return value, but got: %v", i, err) - } - if !tc.shouldErr && err != nil { - t.Fatalf("Test %d: Should not have had error return value, but got: %v", i, err) - } - - if tc.shouldErr && w.Code == http.StatusOK { - t.Fatalf("Test %d: Expected error, but got HTTP %d: %s", - i, w.Code, w.Body.String()) - } - if !tc.shouldErr && w.Code != http.StatusOK { - t.Fatalf("Test %d: Should not have errored, but got HTTP %d: %s", - i, w.Code, w.Body.String()) - } - - // decode the expected config so we can do a convenient DeepEqual - var expectedDecoded interface{} - err = json.Unmarshal([]byte(tc.expect), &expectedDecoded) - if err != nil { - t.Fatalf("Test %d: Unmarshaling expected config: %v", i, err) - } - - // make sure the resulting config is as we expect it - if !reflect.DeepEqual(rawCfg[rawConfigKey], expectedDecoded) { - t.Fatalf("Test %d:\nExpected:\n\t%#v\nActual:\n\t%#v", - i, expectedDecoded, rawCfg[rawConfigKey]) - } - } -} |