UI tests for upload feature

.travis.yml

@@ -103,6 +103,12 @@ matrix:
         apt: *common_apt
         hosts: *common_hosts
         sauce_connect: true
+    - php: 5.6
+      env: DB=pgsql TC=selenium BROWSER="chrome" BROWSER_VERSION="latest" BEHAT_SUITE="upload" PLATFORM="Windows 10" TEST_DAV=0
+      addons:
+        apt: *common_apt
+        hosts: *common_hosts
+        sauce_connect: true
     - php: 5.6
       if: type = cron
       env: DB=pgsql TC=selenium BROWSER="firefox" BROWSER_VERSION="47.0" BEHAT_SUITE="other" PLATFORM="Windows 10" TEST_DAV=0
@@ -159,6 +165,13 @@ matrix:
         apt: *common_apt
         hosts: *common_hosts
         sauce_connect: true
+    - php: 5.6
+      if: type = cron
+      env: DB=pgsql TC=selenium BROWSER="firefox" BROWSER_VERSION="47.0" BEHAT_SUITE="upload" PLATFORM="Windows 10" TEST_DAV=0
+      addons:
+        apt: *common_apt
+        hosts: *common_hosts
+        sauce_connect: true
     - php: 5.6
       env: DB=pgsql TC=litmus-v1
     - php: 5.6
@@ -229,6 +242,13 @@ matrix:
         apt: *common_apt
         hosts: *common_hosts
         sauce_connect: true
+    - php: 5.6
+      if: type = cron
+      env: DB=pgsql TC=selenium BROWSER="chrome" BROWSER_VERSION="latest-1" BEHAT_SUITE="upload" PLATFORM="Windows 10" TEST_DAV=0
+      addons:
+        apt: *common_apt
+        hosts: *common_hosts
+        sauce_connect: true
     - php: 5.6
       if: type = cron
       env: DB=pgsql TC=selenium BROWSER="MicrosoftEdge" BROWSER_VERSION="latest" BEHAT_SUITE="other" PLATFORM="Windows 10" TEST_DAV=0
@@ -285,6 +305,13 @@ matrix:
         apt: *common_apt
         hosts: *common_hosts
         sauce_connect: true
+    - php: 5.6
+      if: type = cron
+      env: DB=pgsql TC=selenium BROWSER="MicrosoftEdge" BROWSER_VERSION="latest" BEHAT_SUITE="upload" PLATFORM="Windows 10" TEST_DAV=0
+      addons:
+        apt: *common_apt
+        hosts: *common_hosts
+        sauce_connect: true
     - php: 5.6
       if: type = cron
       env: DB=pgsql TC=selenium BROWSER="internet explorer" BROWSER_VERSION="11.0" BEHAT_SUITE="other" PLATFORM="Windows 7" TEST_DAV=0
@@ -341,4 +368,11 @@ matrix:
         apt: *common_apt
         hosts: *common_hosts
         sauce_connect: true
+    - php: 5.6
+      if: type = cron
+      env: DB=pgsql TC=selenium BROWSER="internet explorer" BROWSER_VERSION="11.0" BEHAT_SUITE="upload" PLATFORM="Windows 7" TEST_DAV=0
+      addons:
+        apt: *common_apt
+        hosts: *common_hosts
+        sauce_connect: true
   fast_finish: true

tests/TestHelpers/WebDavHelper.php

@@ -103,6 +103,9 @@ public static function makeDavRequest(
 	) {
 		$baseUrl = self::sanitizeUrl($baseUrl, true);
 		$davPath = self::getDavPath($user, $davPathVersionToUse, $type);
+		//replace # and ? in the path, Guzzle will not encode them
+		$path = str_replace("#", "%23", $path);
+		$path = str_replace("?", "%3F", $path);
 		$fullUrl = self::sanitizeUrl($baseUrl . $davPath . $path);
 		$client = new GClient();
 
@@ -116,7 +119,7 @@ public static function makeDavRequest(
 			$options['config']
 				= [ 'curl' => [ CURLOPT_INTERFACE => $sourceIpAddress ]];
 		}
-		
+
 		$request = $client->createRequest($method, $fullUrl, $options);
 		if (!is_null($headers)) {
 			foreach ($headers as $key => $value) {

tests/travis/start_ui_tests.sh

@@ -195,7 +195,8 @@ EXTRA_CAPABILITIES=$EXTRA_CAPABILITIES'"maxDuration":"3600"'
 
 #Set up personalized skeleton
 PREVIOUS_SKELETON_DIR=$($OCC --no-warnings config:system:get skeletondirectory)
-$OCC config:system:set skeletondirectory --value="$(pwd)/tests/ui/skeleton" >/dev/null
+export SKELETON_DIR=$(pwd)/tests/ui/skeleton
+$OCC config:system:set skeletondirectory --value="$SKELETON_DIR" >/dev/null
 
 TEST_LOG_FILE=$(mktemp)
 
@@ -204,6 +205,7 @@ export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"browser_name":
 export IPV4_URL
 export IPV6_URL
 export REMOTE_FED_BASE_URL
+export FILES_FOR_UPLOAD="$(pwd)/tests/ui/filesForUpload/"
 
 lib/composer/bin/behat -c $BEHAT_YML $BEHAT_SUITE_OPTION $BEHAT_TAG_OPTION $BEHAT_TAGS $BEHAT_FEATURE -v  2>&1 | tee -a $TEST_LOG_FILE
 

tests/ui/config/behat.yml

@@ -74,6 +74,16 @@ default:
         - FilesContext:
         - SharingContext:
 
+    upload:
+      paths:
+        - %paths.base%/../features/upload
+      context: *common_suite_context
+      contexts:
+        - FeatureContext:
+        - LoginContext:
+        - UsersContext:
+        - FilesContext:
+
     restrictSharing:
       paths:
         - %paths.base%/../features/restrictSharing

tests/ui/features/bootstrap/FeatureContext.php

@@ -43,7 +43,8 @@ class FeatureContext extends RawMinkContext implements Context {
 	private $owncloudPage;
 	private $loginPage;
 	private $oldCSRFSetting = null;
-
+	private $currentUser = null;
+
 	/**
 	 * 
 	 * @var Page\OwncloudPage
@@ -101,6 +102,21 @@ class FeatureContext extends RawMinkContext implements Context {
 		] 
 	];
 
+	/**
+	 * @return string
+	 */
+	public function getCurrentUser() {
+		return $this->currentUser;
+	}
+
+	/**
+	 * @param string $currentUser
+	 * @return void
+	 */
+	public function setCurrentUser($currentUser) {
+		$this->currentUser = $currentUser;
+	}
+
 	/**
 	 * FeatureContext constructor.
 	 *