Migrate distributables tests to the REST API too

Author: pimterry

test/distributables-test/unix.sh

@@ -26,21 +26,17 @@ curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" 'http://127.0.0.1:45456/start' \
     --data '{"plugins":{"http":{"options":{"cors":false,"suggestChanges":false,"http2":"fallback","https":{"tlsPassthrough":[]}}},"webrtc":{}}}'
 
 echo "\nCan query the API server version?"
-curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
-    --data '{"query": "query getVersion { version }"}'
+curl $CURL_OPTIONS "$WITH_ORIGIN" http://127.0.0.1:45457/version
 
 echo "\nCan get config?"
-curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
-    --data '{"query": "query getConfig { config { certificateContent certificatePath certificateFingerprint } }"}'
+curl $CURL_OPTIONS "$WITH_ORIGIN" http://127.0.0.1:45457/config
 
 echo "\nCan query interceptors?"
-curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
-    --data '{"query": "query getInterceptors { interceptors { id version, metadata isActivable isActive(proxyPort: 8000) } }"}'
+curl $CURL_OPTIONS "$WITH_ORIGIN" http://127.0.0.1:45457/interceptors
 
 echo "\nCan trigger update?"
 # (can't test that it actually updates, unfortunately)
-curl $CURL_OPTIONS "$WITH_ORIGIN" "$AS_JSON" http://127.0.0.1:45457/ \
-    --data '{"query": "mutation TriggerUpdate { triggerUpdate }"}'
+curl $CURL_OPTIONS "$WITH_ORIGIN" -X POST http://127.0.0.1:45457/update
 
 # ^ This will fail if they receive anything but a 200 result.
 # This ensures that the server is startable, and has minimal functionality for launch.

test/distributables-test/windows.bat

@@ -37,23 +37,23 @@ curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% -X POST "http://127.0.0.1:45456/star
 echo:
 echo:
 echo Can query the API server version?
-curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"query getVersion { version }\"}" || goto :error
+curl %CURL_OPTIONS% %WITH_ORIGIN% http://127.0.0.1:45457/version || goto :error
 
 echo:
 echo:
 echo Can get config?
-curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"query getConfig { config { certificateContent certificatePath certificateFingerprint } }\"}" || goto :error
+curl %CURL_OPTIONS% %WITH_ORIGIN% http://127.0.0.1:45457/config || goto :error
 
 echo:
 echo:
 echo Can query interceptors?
-curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"query getInterceptors { interceptors { id version, metadata isActivable isActive(proxyPort: 8000) } }\"}" || goto :error
+curl %CURL_OPTIONS% %WITH_ORIGIN% http://127.0.0.1:45457/interceptors || goto :error
 
 echo:
 echo:
 echo Can trigger update?
 REM (can't test that it actually updates, unfortunately)
-curl %CURL_OPTIONS% %WITH_ORIGIN% %AS_JSON% http://127.0.0.1:45457/ -d "{\"query\": \"mutation TriggerUpdate { triggerUpdate }\"}" || goto :error
+curl %CURL_OPTIONS% %WITH_ORIGIN% -X POST http://127.0.0.1:45457/update || goto :error
 
 REM ^ This will fail if they receive anything but a 200 result.
 REM This ensures that the server is startable, and has minimal functionality for launch.