diff options
| author | Sergio Bertolín <sbertolin@solidgear.es> | 2016-10-04 14:51:54 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-10-20 17:21:08 +0200 |
| commit | 0417cbafd045b13e86c33d72f0a3fd318f97eb43 (patch) | |
| tree | 02880f0b016cb1746251d481048a0b17d5b3922f /build/integration | |
| parent | ed4ed7911a9329462fef02c2d50709b3f092538e (diff) | |
| download | nextcloud-server-0417cbafd045b13e86c33d72f0a3fd318f97eb43.tar.gz nextcloud-server-0417cbafd045b13e86c33d72f0a3fd318f97eb43.zip | |
Changed request to not add a prefix to the url (#26256)
* Changed request to not add a prefix to the url
* Expecting forbidden instead of service unavailable
* Handling login exceptions
Diffstat (limited to 'build/integration')
| -rw-r--r-- | build/integration/features/bootstrap/BasicStructure.php | 9 | ||||
| -rw-r--r-- | build/integration/features/provisioning-v1.feature | 23 |
2 files changed, 29 insertions, 3 deletions
diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index a8438927731..2fc940981eb 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -179,6 +179,15 @@ trait BasicStructure { } } + /** + * @When /^sending "([^"]*)" with exact url to "([^"]*)"$/ + * @param string $verb + * @param string $url + */ + public function sendingToDirectUrl($verb, $url) { + $this->sendingToWithDirectUrl($verb, $url, null); + } + public function sendingToWithDirectUrl($verb, $url, $body) { $fullUrl = substr($this->baseUrl, 0, -5) . $url; $client = new Client(); diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index fba69cd6225..1cf50235f25 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -497,16 +497,25 @@ Feature: provisioning And As an "admin" And user "subadmin" is disabled + Scenario: Making a ocs request with an enabled user + Given As an "admin" + And user "user0" exists + And As an "user0" + When sending "GET" to "/cloud/capabilities" + Then the HTTP status code should be "200" + And the OCS status code should be "100" + Scenario: Making a web request with an enabled user - Given As an "admin" + Given As an "admin" And user "user0" exists And As an "user0" When sending "GET" to "/cloud/capabilities" + When sending "GET" with exact url to "/index.php/apps/files" Then the HTTP status code should be "200" And the OCS status code should be "100" - Scenario: Making a web request with a disabled user - Given As an "admin" + Scenario: Making a ocs request with a disabled user + Given As an "admin" And user "user0" exists And assure user "user0" is disabled And As an "user0" @@ -514,3 +523,11 @@ Feature: provisioning Then the OCS status code should be "997" And the HTTP status code should be "401" + Scenario: Making a web request with a disabled user + Given As an "admin" + And user "user0" exists + And assure user "user0" is disabled + And As an "user0" + When sending "GET" with exact url to "/index.php/apps/files" + And the HTTP status code should be "403" + |