From e300a9b2031d4aea615a31c26f5e77f348af0269 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 7 Jan 2021 00:09:13 +0200 Subject: [PATCH] Added upload test --- tests/SDKTest.php | 23 ++++++++++++++++++++++- tests/languages/php/test.php | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/tests/SDKTest.php b/tests/SDKTest.php index ea0299a05..16464a186 100644 --- a/tests/SDKTest.php +++ b/tests/SDKTest.php @@ -28,6 +28,8 @@ class SDKTest extends TestCase 'php-7.4' => 'docker run --rm -v $(pwd):/app -w /app php:7.4-cli-alpine php tests/languages/php/test.php', 'php-8.0' => 'docker run --rm -v $(pwd):/app -w /app php:8.0.0rc1-cli-alpine php tests/languages/php/test.php', ], + 'supportRedirect' => true, + 'supportUpload' => true, ], 'dart' => [ @@ -43,6 +45,8 @@ class SDKTest extends TestCase 'dart-2.8' => 'docker run --rm --tty -it -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor google/dart:2.8 pub run tests/tests.dart', 'dart-2.10' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dart --env PUB_CACHE=vendor google/dart:2.10 dart pub run tests/tests.dart', ], + 'supportRedirect' => true, + 'supportUpload' => true, ], 'java' => [ @@ -55,6 +59,8 @@ class SDKTest extends TestCase 'java-11' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/java --env PUB_CACHE=vendor maven:3.6-jdk-11-slim mvn clean install test -q', //'java-14' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/java --env PUB_CACHE=vendor maven:3.6-jdk-14-slim mvn clean install test -q', ], + 'supportRedirect' => false, + 'supportUpload' => false, ], 'dotnet' => [ @@ -68,6 +74,8 @@ class SDKTest extends TestCase 'envs' => [ 'powershell' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/dotnet/src/test/ mcr.microsoft.com/powershell:alpine-3.11 pwsh tests.ps1', ], + 'supportRedirect' => false, + 'supportUpload' => false, ], 'typescript' => [ @@ -81,6 +89,8 @@ class SDKTest extends TestCase 'envs' => [ 'nodejs-14' => 'docker run --rm -v $(pwd):/app -w /app node:14.5-alpine node tests/sdks/typescript/tests.js', ], + 'supportRedirect' => false, + 'supportUpload' => false, ], 'deno' => [ @@ -90,6 +100,8 @@ class SDKTest extends TestCase 'envs' => [ 'deno-1.1.3' => 'docker run --rm -v $(pwd):/app -w /app hayd/alpine-deno:1.1.3 run --allow-net --allow-read tests/languages/deno/tests.ts', // TODO: use official image when its out ], + 'supportRedirect' => true, + 'supportUpload' => true, ], 'node' => [ @@ -103,6 +115,8 @@ class SDKTest extends TestCase 'nodejs-12' => 'docker run --rm -v $(pwd):/app -w /app node:12.12-alpine node tests/languages/node/test.js', 'nodejs-14' => 'docker run --rm -v $(pwd):/app -w /app node:14.5-alpine node tests/languages/node/test.js', ], + 'supportRedirect' => true, + 'supportUpload' => true, ], 'ruby' => [ @@ -115,6 +129,8 @@ class SDKTest extends TestCase 'ruby-2.5' => 'docker run --rm -v $(pwd):/app -w /app ruby:2.5-alpine ruby tests/languages/ruby/tests.rb', 'ruby-2.4' => 'docker run --rm -v $(pwd):/app -w /app ruby:2.4-alpine ruby tests/languages/ruby/tests.rb', ], + 'supportRedirect' => true, + 'supportUpload' => false, ], 'python' => [ @@ -134,6 +150,8 @@ class SDKTest extends TestCase // 'python-3.2' => 'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor --env PYTHONPATH=tests/sdks/python/vendor python:3.2 python tests/sdks/python/test.py', // 'python-3.1' => 'docker run --rm -v $(pwd):/app -w /app --env PIP_TARGET=tests/sdks/python/vendor --env PYTHONPATH=tests/sdks/python/vendor python:3.1 python tests/sdks/python/test.py', ], + 'supportRedirect' => true, + 'supportUpload' => true, ], ]; @@ -235,7 +253,10 @@ public function testHTTPSuccess() $this->assertEquals('DELETE:/v1/mock/tests/bar:passed', $output[9] ?? ''); $this->assertEquals('GET:/v1/mock/tests/general/redirect/done:passed', $output[10]); - //$this->assertEquals($output[11], 'POST:/v1/mock/tests/general/upload:passed'); + + if($options['supportUpload']) { + $this->assertEquals($output[11], 'POST:/v1/mock/tests/general/upload:passed'); + } } } diff --git a/tests/languages/php/test.php b/tests/languages/php/test.php index f16e2f867..1db31635a 100644 --- a/tests/languages/php/test.php +++ b/tests/languages/php/test.php @@ -55,5 +55,5 @@ $resposne = $general->redirect(); echo "{$resposne['result']}\n"; -$resposne = $general->upload('string', 123, ['string in array'], new \CURLFile(__DIR__.'/../../resources/file.png')); +$resposne = $general->upload('string', 123, ['string in array'], new \CURLFile(__DIR__.'/../../resources/file.png', 'image/png', 'file.png')); echo "{$resposne['result']}\n"; \ No newline at end of file