From c36bb9e0fa9e962d0e1806f72b6b7a473a7af45c Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 09:55:02 +0545
Subject: [PATCH 01/16] get multiple notifications

---
 .../ui/features/bootstrap/FeatureContext.php  | 23 +++++++++++++++++++
 tests/ui/features/lib/OwncloudPage.php        |  9 ++++++++
 2 files changed, 32 insertions(+)

diff --git a/tests/ui/features/bootstrap/FeatureContext.php b/tests/ui/features/bootstrap/FeatureContext.php
index a23cf5951f41..00d1ab318567 100644
--- a/tests/ui/features/bootstrap/FeatureContext.php
+++ b/tests/ui/features/bootstrap/FeatureContext.php
@@ -23,6 +23,7 @@
 use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\MinkExtension\Context\RawMinkContext;
+use Behat\Gherkin\Node\TableNode;
 use Page\OwncloudPage;
 use Page\LoginPage;
 
@@ -54,6 +55,28 @@ public function aNotificationShouldBeDisplayedWithTheText($notificationText)
 		);
 	}
 
+	/**
+	 * @Then notifications should be displayed with the text
+	 */
+	public function notificationsShouldBeDisplayedWithTheText(TableNode $table)
+	{
+		$notifications = $this->owncloudPage->getNotifications();
+		$tableRows=$table->getRows();
+		PHPUnit_Framework_Assert::assertEquals(
+			count($tableRows),
+			count($notifications)
+			);
+		
+		$notificationCounter=0;
+		foreach ($tableRows as $row) {
+			PHPUnit_Framework_Assert::assertEquals(
+				$row[0],
+				$notifications[$notificationCounter]
+				);
+			$notificationCounter++;
+		}
+	}
+
 	/**
 	 * @Then I should be redirected to a page with the title :title
 	 */
diff --git a/tests/ui/features/lib/OwncloudPage.php b/tests/ui/features/lib/OwncloudPage.php
index 3ad992ac5487..21ea4ce7089f 100644
--- a/tests/ui/features/lib/OwncloudPage.php
+++ b/tests/ui/features/lib/OwncloudPage.php
@@ -50,6 +50,15 @@ public function getNotificationText() {
 		return $this->findById("notification")->getText();
 	}
 
+	public function getNotifications() {
+		$notificationsText=array();
+		$notifications=$this->findById("notification");
+		foreach ($notifications->findAll("xpath", "div") as $notification) {
+			array_push($notificationsText, $notification->getText());
+		}
+		return $notificationsText;
+	}
+
 	/**
 	 * finds the own username displayed in the top right corner
 	 * @return string

From 06ecb2ecea3f7c0824d137eafb14653f71b24edd Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 09:55:41 +0545
Subject: [PATCH 02/16] read tooltip that is displayed beside file

---
 tests/ui/features/lib/FilesPage.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/ui/features/lib/FilesPage.php b/tests/ui/features/lib/FilesPage.php
index 76dbdbabf240..d62dc705d774 100644
--- a/tests/ui/features/lib/FilesPage.php
+++ b/tests/ui/features/lib/FilesPage.php
@@ -98,6 +98,18 @@ public function waitTillPageIsloaded($timeout)
 		}
 	}
 
+	/**
+	 * returns the tooltip that is displayed next to the filename if something is wrong
+	 * @param string $fileName
+	 * @param Session $session
+	 * @return string
+	 */
+	public function getTooltipOfFile ($fileName, Session $session)
+	{
+		$fileRow=$this->findFileRowByName($fileName, $session);
+		return $fileRow->find("xpath", $this->fileTooltipXpath)->getText();
+	}
+	
 	/**
 	 * same as the original open() function but with a more slack
 	 * URL verification as oC adds some extra parameters to the URL e.g.

From c955dbbc35b768a64de9a22feb20fc2d87f7f15f Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 09:56:40 +0545
Subject: [PATCH 03/16] extend filesPageObject to rename files

---
 tests/ui/features/lib/FilesPage.php | 152 ++++++++++++++++++++++++++--
 1 file changed, 145 insertions(+), 7 deletions(-)

diff --git a/tests/ui/features/lib/FilesPage.php b/tests/ui/features/lib/FilesPage.php
index d62dc705d774..524c11f1ffdc 100644
--- a/tests/ui/features/lib/FilesPage.php
+++ b/tests/ui/features/lib/FilesPage.php
@@ -25,6 +25,7 @@
 
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Exception\UnexpectedPageException;
+use Behat\Mink\Session;
 
 
 class FilesPage extends OwnCloudPage
@@ -39,17 +40,23 @@ class FilesPage extends OwnCloudPage
 	protected $newFileFolderButtonXpath = './/*[@id="controls"]//a[@class="button new"]';
 	protected $newFolderButtonXpath = './/div[contains(@class, "newFileMenu")]//a[@data-templatename="New folder"]';
 	protected $newFolderNameInputLabel = 'New folder';
-	protected $fileActionMenuXpathByNo = ".//*[@id='fileList']/tr[%d]//a[@data-action='menu']";
+	protected $fileActionMenuBtnXpathByNo = ".//*[@id='fileList']/tr[%d]//a[@data-action='menu']";
+	protected $fileActionMenuBtnXpath = "//a[@data-action='menu']";
+	protected $fileActionMenuXpath = "//div[contains(@class,'fileActionsMenu')]";
+	protected $fileNamesXpath = "//span[@class='nametext']";
+	protected $fileRowFromNameXpath = "/../../..";
+	protected $fileActionXpath = "//a[@data-action='%s']";
+	protected $fileRenameInputXpath = "//*[@class='filename']";
+	protected $fileBusyIndicatorXpath = ".//*[@class='thumbnail' and contains(@style,'loading')]";
+	protected $appContentId ="app-content";
+	protected $renameActionLabel = "Rename";
+	protected $fileTooltipXpath = ".//*[@class='tooltip-inner']";
+	//TODO make simpler, only ID .//*[@id='fileList']
 	protected $fileListXpath = ".//div[@id='app-content-files']//tbody[@id='fileList']";
 	protected $fileDeleteXpathByNo = ".//*[@id='fileList']/tr[%d]//a[@data-action='Delete']";
 
 	private $strForNormalFileName = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
 
-	public function findFileInList($filename)
-	{
-		return $this->findLink($filename);
-	}
-
 	/**
 	 * created a folder with the given name.
 	 * If name is not given a random one is choosen
@@ -74,10 +81,141 @@ public function getSizeOfFileFolderList()
 		);
 	}
 	public function findActionMenuByNo($number) {
-		$xpath = sprintf($this->fileActionMenuXpathByNo,$number);
+		$xpath = sprintf($this->fileActionMenuBtnXpathByNo,$number);
 		return $this->find("xpath", $xpath);
 	}
 
+	/**
+	 * finds the complete row of the file
+	 * 
+	 * @param string $name
+	 * @param Session $session
+	 * @return \Behat\Mink\Element\NodeElement|NULL
+	 */
+	public function findFileRowByName($name, Session $session)
+	{
+		$lastFileNameCoordinates ["top"] = 0;
+		$appContentHeight = 0;
+		$previousFileCounter = 0;
+		
+		//loop to keep on scrolling down to load not viewed files
+		while ( $lastFileNameCoordinates ["top"] <= $appContentHeight ) {
+			$fileNameSpans = $this->find("xpath", $this->fileListXpath)->findAll(
+				"xpath", $this->fileNamesXpath
+			);
+			
+			//file counts are not increasing, the file is not there
+			if (($previousFileCounter+1) === count($fileNameSpans)) {
+				return null;
+			}
+			//check every file if the name is the one we are searching for
+			//but no need to check names that we checked already ($previousFileCounter)
+			for ($fileCounter = $previousFileCounter;
+				$fileCounter < count($fileNameSpans);
+				$fileCounter ++) {
+
+				//found the file
+				if ($fileNameSpans[$fileCounter]->getText() === $name ||
+					strip_tags($fileNameSpans[$fileCounter]->getHtml()) === $name) {
+					return $fileNameSpans[$fileCounter]->find(
+						"xpath", $this->fileRowFromNameXpath
+					);
+				}
+				$previousFileCounter = $fileCounter;
+			}
+			$lastFileNameCoordinates = $this->getCoordinatesOfElement(
+				$session, $fileNameSpans [$previousFileCounter]
+			);
+			// scroll to the bottom of the page
+			// we need to scroll because the files app does only load a part of
+			// the files in one screen
+			$this->scrollDownAppContent(count($fileNameSpans), $session);
+			
+			// get the new height of the content div
+			$appContentHeight = ( int ) $session->evaluateScript(
+				'$("#' . $this->appContentId . '")[0].scrollHeight;'
+			);
+		}
+	}
+
+	/**
+	 * scrolls down the file list, to load not yet displayed files
+	 * @param int $numberOfFilesOld how many files were listed before the scroll.
+	 * So we can guess how long to wait for the loading of new files to finish
+	 * @param Session $session
+	 * @param int $timeout
+	 */
+	public function scrollDownAppContent ($numberOfFilesOld, Session $session, $timeout=5)
+	{
+		$session->evaluateScript(
+			'$("#' . $this->appContentId . '").scrollTop($("#' . $this->appContentId . '")[0].scrollHeight);'
+		);
+		
+		// there is no loading indicator here, so we are going to wait until we have
+		// more files than before
+		for ($counter = 0; $counter <= $timeout; $counter ++) {
+			$fileNameSpans = $this->find("xpath", $this->fileListXpath)->findAll(
+				"xpath", $this->fileNamesXpath
+			);
+			if (count($fileNameSpans) > $numberOfFilesOld) {
+				break;
+			}
+			sleep(1);
+		}
+	}
+
+	/**
+	 * Takes a row of a file and finds the Action Button in it
+	 * @param \Behat\Mink\Element\NodeElement $fileRow
+	 * @return \Behat\Mink\Element\NodeElement|NULL
+	 */
+	public function findFileActionButtonInFileRow (\Behat\Mink\Element\NodeElement $fileRow)
+	{
+		return $fileRow->find("xpath", $this->fileActionMenuBtnXpath);
+	}
+
+	/**
+	 * Takes a row of a file and finds the File Action in it
+	 * the File Action Button must be clicked first
+	 * @param \Behat\Mink\Element\NodeElement $fileRow
+	 * @return \Behat\Mink\Element\NodeElement|NULL
+	 */
+	public function findFileActionMenuInFileRow (\Behat\Mink\Element\NodeElement $fileRow)
+	{
+		return $fileRow->find("xpath", $this->fileActionMenuXpath);
+	}
+
+	/**
+	 * finds the actual action link in the action menu
+	 * @param string $action
+	 * @param \Behat\Mink\Element\NodeElement $actionMenu
+	 * @return \Behat\Mink\Element\NodeElement|NULL
+	 */
+	public function findButtonInActionMenu ($action, \Behat\Mink\Element\NodeElement $actionMenu)
+	{
+		return $actionMenu->find("xpath", 
+			sprintf($this->fileActionXpath, $action)
+		);
+	}
+
+	/**
+	 * renames a file
+	 * @param string $fromFileName
+	 * @param string $toFileName
+	 * @param Session $session
+	 */
+	public function renameFile($fromFileName, $toFileName, Session $session)
+	{
+		$fileRow=$this->findFileRowByName($fromFileName, $session);
+		$actionMenuBtn=$this->findFileActionButtonInFileRow($fileRow);
+		$actionMenuBtn->click();
+		$actionMenu=$this->findFileActionMenuInFileRow($fileRow);
+		$this->findButtonInActionMenu($this->renameActionLabel, $actionMenu)->click();
+		$fileRow->find("xpath", $this->fileRenameInputXpath)->setValue($toFileName);
+		$fileRow->find("xpath", $this->fileRenameInputXpath)->blur();
+		$this->waitTillElementIsNull($this->fileBusyIndicatorXpath);
+	}
+
 	public function findDeleteByNo($number) {
 		$xpath = sprintf($this->fileDeleteXpathByNo,$number);
 		return $this->find("xpath", $xpath);

From 17c5792d9701df5a2eae2c5cfac13cc096d2c734 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 09:57:15 +0545
Subject: [PATCH 04/16] add waitTillElementIsNull

---
 tests/ui/features/lib/OwncloudPage.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/ui/features/lib/OwncloudPage.php b/tests/ui/features/lib/OwncloudPage.php
index 21ea4ce7089f..01405933dcf0 100644
--- a/tests/ui/features/lib/OwncloudPage.php
+++ b/tests/ui/features/lib/OwncloudPage.php
@@ -46,6 +46,22 @@ public function waitTillPageIsloaded($timeout)
 
 	}
 
+	/**
+	 *
+	 * @param string $xpath
+	 * @param int $timeout
+	 */
+	public function waitTillElementIsNull ($xpath, $timeout=10)
+	{
+		for ($counter = 0; $counter <= $timeout; $counter ++) {
+			$element = $this->find("xpath",$xpath);
+			if ($element === null) {
+				break;
+			}
+			sleep(1);
+		}
+	}
+
 	public function getNotificationText() {
 		return $this->findById("notification")->getText();
 	}

From e8e64567d5a158d8eea7e0a1a196b6070898db73 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 09:57:47 +0545
Subject: [PATCH 05/16] add rename file feature

---
 tests/ui/features/bootstrap/FilesContext.php | 43 +++++++++++++++++++-
 tests/ui/features/renameFiles.feature        | 39 ++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 tests/ui/features/renameFiles.feature

diff --git a/tests/ui/features/bootstrap/FilesContext.php b/tests/ui/features/bootstrap/FilesContext.php
index c094198fd966..d3f25aa017a9 100644
--- a/tests/ui/features/bootstrap/FilesContext.php
+++ b/tests/ui/features/bootstrap/FilesContext.php
@@ -22,7 +22,7 @@
 
 use Behat\Behat\Context\Context;
 use Behat\MinkExtension\Context\RawMinkContext;
-
+use Behat\Gherkin\Node\TableNode;
 use Page\FilesPage;
 
 require_once 'bootstrap.php';
@@ -76,6 +76,47 @@ public function theListOfFilesFoldersDoesNotFitInOneBrowserPage()
 		$this->filesPage->waitTillPageIsloaded(10);
 	}
 
+	/**
+	 * @Given I rename the file :fromFileName to :toFileName
+	 */
+	public function iRenameTheFileTo($fromFileName, $toFileName)
+	{
+		$this->filesPage->waitTillPageIsloaded(10);
+		$this->filesPage->renameFile($fromFileName, $toFileName, $this->getSession());
+	}
+
+	/**
+	 * @When I rename the file :fromFileName to one of these names
+	 */
+	public function iRenameTheFileToOneOfThisNames($fromFileName, TableNode $table)
+	{
+		$this->filesPage->waitTillPageIsloaded(10);
+		foreach ($table->getRows() as $row) {
+			$this->filesPage->renameFile($fromFileName, $row[0], $this->getSession());
+		}
+		
+	}
+
+	/**
+	 * @Then the file :fileName should be listed
+	 */
+	public function theFileShouldBeListed($fileName)
+	{
+		PHPUnit_Framework_Assert::assertNotNull(
+			$this->filesPage->findFileRowByName($fileName, $this->getSession())
+		);
+	}
+
+	/**
+	 * @Then near the file :fileName a tooltip with the text :toolTipText should be displayed
+	 */
+	public function nearTheFileATooltipWithTheTextShouldBeDisplayed($fileName, $toolTipText)
+	{
+		PHPUnit_Framework_Assert::assertEquals($toolTipText, 
+			$this->filesPage->getTooltipOfFile($fileName, $this->getSession())
+		);
+	}
+
 	/**
 	 * @Then the filesactionmenu should be completely visible after clicking on it
 	 */
diff --git a/tests/ui/features/renameFiles.feature b/tests/ui/features/renameFiles.feature
new file mode 100644
index 000000000000..c670b4f10819
--- /dev/null
+++ b/tests/ui/features/renameFiles.feature
@@ -0,0 +1,39 @@
+Feature: renameFiles
+
+	Scenario: Rename a file using special characters
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the file "lorem.txt" to "लोरेम।तयक्स्त $%&"
+		Then the file "लोरेम।तयक्स्त $%&" should be listed
+
+	Scenario: Rename a file using special characters check its existence after page reload
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the file "lorem.txt" to "लोरेम।तयक्स्त $%&"
+		And the page is reloaded
+		Then the file "लोरेम।तयक्स्त $%&" should be listed
+
+	Scenario: Rename a file using forbidden characters
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the file "data.zip" to one of these names
+		|lorem/txt  |
+		|.htaccess  |
+		|lorem\txt  |
+		|\\.txt     |
+		Then notifications should be displayed with the text
+		|Could not rename "data.zip"|
+		|Could not rename "data.zip"|
+		|Could not rename "data.zip"|
+		|Could not rename "data.zip"|
+		And the file "data.zip" should be listed
+
+	Scenario: Rename a file putting a name of a file which already exists
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the file "data.zip" to "lorem.txt"
+		Then near the file "data.zip" a tooltip with the text 'lorem.txt already exists' should be displayed
\ No newline at end of file

From ab7c42c071402c98d9ac650edeeb4e08c492da10 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Thu, 18 May 2017 16:32:09 +0545
Subject: [PATCH 06/16] update mink-selenium2-driver to dev-master

need to get this PR 244 MinkSelenium2Driver
It fixes an issue with typing into autocomplete boxes
---
 composer.json |  2 +-
 composer.lock | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index c077be3d06a6..6472cca43a5f 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "mikey179/vfsStream": "^1.6",
         "behat/mink-extension": "^2.2",
         "behat/mink-goutte-driver": "^1.2",
-        "behat/mink-selenium2-driver": "^1.3",
+        "behat/mink-selenium2-driver": "dev-master",
         "sensiolabs/behat-page-object-extension": "^2.0",
         "behat/behat": "^3.0",
         "jarnaiz/behat-junit-formatter": "^1.3"
diff --git a/composer.lock b/composer.lock
index 080fe5fe8d5a..f85dbf466fb2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "e58f3414934ab1ea7f5cd2813eb61e63",
+    "content-hash": "67e16fd2fefd05ad17877c9456e6b40e",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -3289,16 +3289,16 @@
         },
         {
             "name": "behat/mink-selenium2-driver",
-            "version": "v1.3.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkSelenium2Driver.git",
-                "reference": "473a9f3ebe0c134ee1e623ce8a9c852832020288"
+                "reference": "739b7570f0536bad9b07b511a62c885ee1ec029a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/473a9f3ebe0c134ee1e623ce8a9c852832020288",
-                "reference": "473a9f3ebe0c134ee1e623ce8a9c852832020288",
+                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/739b7570f0536bad9b07b511a62c885ee1ec029a",
+                "reference": "739b7570f0536bad9b07b511a62c885ee1ec029a",
                 "shasum": ""
             },
             "require": {
@@ -3307,7 +3307,7 @@
                 "php": ">=5.3.1"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
+                "mink/driver-testsuite": "dev-master"
             },
             "type": "mink-driver",
             "extra": {
@@ -3346,7 +3346,7 @@
                 "testing",
                 "webdriver"
             ],
-            "time": "2016-03-05T09:10:18+00:00"
+            "time": "2017-02-06 08:22:23"
         },
         {
             "name": "behat/transliterator",
@@ -5801,7 +5801,8 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "swiftmailer/swiftmailer": 0
+        "swiftmailer/swiftmailer": 0,
+        "behat/mink-selenium2-driver": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

From 93198f1ab111d04ddd881c656f5a273719f5079f Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 14:56:07 +0545
Subject: [PATCH 07/16] set selenium version in case of Firefox

This was never needed, only after updating mink-selenium2-driver
And then it would not give any usefull output why it failed only
Expected to be on "http://localhost/owncloud-core/index.php/login" but found "" instead (SensioLabs\Behat\PageObjectExtension\PageObject\Exception\UnexpectedPageException)

Had to do network sniffing beween mink and saucelabs proxy to find out that it reported:
The requested combination of browser, version and OS is unsupported by the requested Selenium version and would lead to a test failure. Please set a different Selenium version, or set none to get the default, working Selenium version for this platform: firefox 47.0. on Windows 2008 with Selenium 2.31.0

What is also not true, because the correct version of selenium has to be 2.53.1 as per documentation: https://wiki.saucelabs.com/display/DOCS/Test+Configuration+Options#TestConfigurationOptions-SeleniumVersion
---
 tests/travis/start_behat_tests.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/travis/start_behat_tests.sh b/tests/travis/start_behat_tests.sh
index 032fe0c26304..600751c1f844 100644
--- a/tests/travis/start_behat_tests.sh
+++ b/tests/travis/start_behat_tests.sh
@@ -15,8 +15,14 @@ then
 else
 	BASE_URL="http://$SRV_HOST_NAME:$SRV_HOST_PORT/$SRV_HOST_URL"
 fi
+
+if [ "$BROWSER" == "firefox" ]
+then
+	EXTRA_CAPABILITIES='"seleniumVersion":"2.53.1"'
+fi
+
 echo "Running tests on '$BROWSER' ($BROWSER_VERSION) on $PLATFORM"
-export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"browser_name": "'$BROWSER'", "base_url" : "'$BASE_URL'","selenium2":{"capabilities": {"browser": "'$BROWSER'", "version": "'$BROWSER_VERSION'", "platform": "'$PLATFORM'", "name": "'$TRAVIS_REPO_SLUG' - '$TRAVIS_JOB_NUMBER'"}, "wd_host":"http://'$SAUCE_USERNAME:$SAUCE_ACCESS_KEY'@localhost:4445/wd/hub"}}}}' 
+export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"browser_name": "'$BROWSER'", "base_url" : "'$BASE_URL'","selenium2":{"capabilities": {"browser": "'$BROWSER'", "version": "'$BROWSER_VERSION'", "platform": "'$PLATFORM'", "name": "'$TRAVIS_REPO_SLUG' - '$TRAVIS_JOB_NUMBER'", "extra_capabilities": {'$EXTRA_CAPABILITIES'}}, "wd_host":"http://'$SAUCE_USERNAME:$SAUCE_ACCESS_KEY'@localhost:4445/wd/hub"}}}}' 
 
 if [ "$BROWSER" == "internet explorer" ]
 then

From 4c72c2471298c5ea5cb2eadeaf28e95bd048e181 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 12:04:25 +0545
Subject: [PATCH 08/16] do not check screen position to see if more files are
 comming

---
 tests/ui/features/lib/FilesPage.php | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/tests/ui/features/lib/FilesPage.php b/tests/ui/features/lib/FilesPage.php
index 524c11f1ffdc..a5d369479cb8 100644
--- a/tests/ui/features/lib/FilesPage.php
+++ b/tests/ui/features/lib/FilesPage.php
@@ -97,23 +97,19 @@ public function findFileRowByName($name, Session $session)
 		$lastFileNameCoordinates ["top"] = 0;
 		$appContentHeight = 0;
 		$previousFileCounter = 0;
-		
+		$fileNameSpans = array();
+
+		$fileNameSpans = $this->find("xpath", $this->fileListXpath)->findAll(
+			"xpath", $this->fileNamesXpath
+		);
 		//loop to keep on scrolling down to load not viewed files
-		while ( $lastFileNameCoordinates ["top"] <= $appContentHeight ) {
-			$fileNameSpans = $this->find("xpath", $this->fileListXpath)->findAll(
-				"xpath", $this->fileNamesXpath
-			);
-			
-			//file counts are not increasing, the file is not there
-			if (($previousFileCounter+1) === count($fileNameSpans)) {
-				return null;
-			}
+		//when the file count is not increasing, the file is not there
+		while ($previousFileCounter < count($fileNameSpans)) {
 			//check every file if the name is the one we are searching for
 			//but no need to check names that we checked already ($previousFileCounter)
 			for ($fileCounter = $previousFileCounter;
 				$fileCounter < count($fileNameSpans);
 				$fileCounter ++) {
-
 				//found the file
 				if ($fileNameSpans[$fileCounter]->getText() === $name ||
 					strip_tags($fileNameSpans[$fileCounter]->getHtml()) === $name) {
@@ -123,17 +119,14 @@ public function findFileRowByName($name, Session $session)
 				}
 				$previousFileCounter = $fileCounter;
 			}
-			$lastFileNameCoordinates = $this->getCoordinatesOfElement(
-				$session, $fileNameSpans [$previousFileCounter]
-			);
+
 			// scroll to the bottom of the page
 			// we need to scroll because the files app does only load a part of
 			// the files in one screen
 			$this->scrollDownAppContent(count($fileNameSpans), $session);
 			
-			// get the new height of the content div
-			$appContentHeight = ( int ) $session->evaluateScript(
-				'$("#' . $this->appContentId . '")[0].scrollHeight;'
+			$fileNameSpans = $this->find("xpath", $this->fileListXpath)->findAll(
+				"xpath", $this->fileNamesXpath
 			);
 		}
 	}

From 9d605ffcfceebc6f3f66deda8d600000cbe21995 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Mon, 15 May 2017 17:27:03 +0545
Subject: [PATCH 09/16] more special char file renaming tests

---
 tests/ui/features/renameFiles.feature | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/tests/ui/features/renameFiles.feature b/tests/ui/features/renameFiles.feature
index c670b4f10819..153112e9b24e 100644
--- a/tests/ui/features/renameFiles.feature
+++ b/tests/ui/features/renameFiles.feature
@@ -1,11 +1,29 @@
 Feature: renameFiles
 
-	Scenario: Rename a file using special characters
+	Scenario Outline: Rename a file using special characters
 		Given a regular user exists
 		And I am logged in as a regular user
 		And I am on the files page
-		When I rename the file "lorem.txt" to "लोरेम।तयक्स्त $%&"
-		Then the file "लोरेम।तयक्स्त $%&" should be listed
+		When I rename the file "lorem.txt" to <to_file_name>
+		Then the file <to_file_name> should be listed
+		Examples:
+		|to_file_name  |
+		|'लोरेम।तयक्स्त $%&'    |
+		|'"quotes1"'   |
+		|"'quotes2'"   |
+
+		
+	Scenario Outline: Rename a file that has special characters in its name
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the file <from_name> to <to_name>
+		Then the file <to_name> should be listed
+		Examples:
+		|from_name                            |to_name                              |
+		|"strängé filename (duplicate #2).txt"|"strängé filename (duplicate #3).txt"|
+		|"'single'quotes.txt"                 |"single-quotes.txt"                  |
+		|'"double"quotes.txt'                 |'double-quotes.txt'                  |
 
 	Scenario: Rename a file using special characters check its existence after page reload
 		Given a regular user exists

From bae2b5ba3c4cb8ca028daa91038eec4f8f2f87e4 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Mon, 15 May 2017 17:26:05 +0545
Subject: [PATCH 10/16] more test files

---
 "tests/ui/skeleton/\"double\"_and_'single'_quotes.txt"        | 4 ++++
 .../skeleton/\"double\"_and_'single'_quotes/for-git-commit"   | 1 +
 "tests/ui/skeleton/\"double\"quotes.txt"                      | 4 ++++
 "tests/ui/skeleton/\"double\"quotes/for-git-commit"           | 1 +
 tests/ui/skeleton/'single'quotes.txt                          | 4 ++++
 tests/ui/skeleton/'single'quotes/for-git-commit               | 1 +
 6 files changed, 15 insertions(+)
 create mode 100644 "tests/ui/skeleton/\"double\"_and_'single'_quotes.txt"
 create mode 100644 "tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit"
 create mode 100644 "tests/ui/skeleton/\"double\"quotes.txt"
 create mode 100644 "tests/ui/skeleton/\"double\"quotes/for-git-commit"
 create mode 100644 tests/ui/skeleton/'single'quotes.txt
 create mode 100644 tests/ui/skeleton/'single'quotes/for-git-commit

diff --git "a/tests/ui/skeleton/\"double\"_and_'single'_quotes.txt" "b/tests/ui/skeleton/\"double\"_and_'single'_quotes.txt"
new file mode 100644
index 000000000000..b62c3fb2ffd3
--- /dev/null
+++ "b/tests/ui/skeleton/\"double\"_and_'single'_quotes.txt"
@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git "a/tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit" "b/tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit"
new file mode 100644
index 000000000000..86459fd55043
--- /dev/null
+++ "b/tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit"
@@ -0,0 +1 @@
+this file is only here because git does not allow to commit empty folders
\ No newline at end of file
diff --git "a/tests/ui/skeleton/\"double\"quotes.txt" "b/tests/ui/skeleton/\"double\"quotes.txt"
new file mode 100644
index 000000000000..b62c3fb2ffd3
--- /dev/null
+++ "b/tests/ui/skeleton/\"double\"quotes.txt"
@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git "a/tests/ui/skeleton/\"double\"quotes/for-git-commit" "b/tests/ui/skeleton/\"double\"quotes/for-git-commit"
new file mode 100644
index 000000000000..86459fd55043
--- /dev/null
+++ "b/tests/ui/skeleton/\"double\"quotes/for-git-commit"
@@ -0,0 +1 @@
+this file is only here because git does not allow to commit empty folders
\ No newline at end of file
diff --git a/tests/ui/skeleton/'single'quotes.txt b/tests/ui/skeleton/'single'quotes.txt
new file mode 100644
index 000000000000..b62c3fb2ffd3
--- /dev/null
+++ b/tests/ui/skeleton/'single'quotes.txt
@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/tests/ui/skeleton/'single'quotes/for-git-commit b/tests/ui/skeleton/'single'quotes/for-git-commit
new file mode 100644
index 000000000000..86459fd55043
--- /dev/null
+++ b/tests/ui/skeleton/'single'quotes/for-git-commit
@@ -0,0 +1 @@
+this file is only here because git does not allow to commit empty folders
\ No newline at end of file

From 54a30cd55570ae54c1e5e6e1906c1406f20cc9cb Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Mon, 15 May 2017 17:26:37 +0545
Subject: [PATCH 11/16] rename folder feature

---
 tests/ui/features/bootstrap/FilesContext.php | 24 +++++-----
 tests/ui/features/renameFolders.feature      | 50 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 12 deletions(-)
 create mode 100644 tests/ui/features/renameFolders.feature

diff --git a/tests/ui/features/bootstrap/FilesContext.php b/tests/ui/features/bootstrap/FilesContext.php
index d3f25aa017a9..e109768feb5c 100644
--- a/tests/ui/features/bootstrap/FilesContext.php
+++ b/tests/ui/features/bootstrap/FilesContext.php
@@ -77,43 +77,43 @@ public function theListOfFilesFoldersDoesNotFitInOneBrowserPage()
 	}
 
 	/**
-	 * @Given I rename the file :fromFileName to :toFileName
+	 * @Given I rename the file/folder :fromName to :toName
 	 */
-	public function iRenameTheFileTo($fromFileName, $toFileName)
+	public function iRenameTheFileFolderTo($fromName, $toName)
 	{
 		$this->filesPage->waitTillPageIsloaded(10);
-		$this->filesPage->renameFile($fromFileName, $toFileName, $this->getSession());
+		$this->filesPage->renameFile($fromName, $toName, $this->getSession());
 	}
 
 	/**
-	 * @When I rename the file :fromFileName to one of these names
+	 * @When I rename the file/folder :fromName to one of these names
 	 */
-	public function iRenameTheFileToOneOfThisNames($fromFileName, TableNode $table)
+	public function iRenameTheFileToOneOfThisNames($fromName, TableNode $table)
 	{
 		$this->filesPage->waitTillPageIsloaded(10);
 		foreach ($table->getRows() as $row) {
-			$this->filesPage->renameFile($fromFileName, $row[0], $this->getSession());
+			$this->filesPage->renameFile($fromName, $row[0], $this->getSession());
 		}
 		
 	}
 
 	/**
-	 * @Then the file :fileName should be listed
+	 * @Then the file/folder :name should be listed
 	 */
-	public function theFileShouldBeListed($fileName)
+	public function theFileFolderShouldBeListed($name)
 	{
 		PHPUnit_Framework_Assert::assertNotNull(
-			$this->filesPage->findFileRowByName($fileName, $this->getSession())
+			$this->filesPage->findFileRowByName($name, $this->getSession())
 		);
 	}
 
 	/**
-	 * @Then near the file :fileName a tooltip with the text :toolTipText should be displayed
+	 * @Then near the file/folder :name a tooltip with the text :toolTipText should be displayed
 	 */
-	public function nearTheFileATooltipWithTheTextShouldBeDisplayed($fileName, $toolTipText)
+	public function nearTheFileATooltipWithTheTextShouldBeDisplayed($name, $toolTipText)
 	{
 		PHPUnit_Framework_Assert::assertEquals($toolTipText, 
-			$this->filesPage->getTooltipOfFile($fileName, $this->getSession())
+			$this->filesPage->getTooltipOfFile($name, $this->getSession())
 		);
 	}
 
diff --git a/tests/ui/features/renameFolders.feature b/tests/ui/features/renameFolders.feature
new file mode 100644
index 000000000000..80c351fe3d10
--- /dev/null
+++ b/tests/ui/features/renameFolders.feature
@@ -0,0 +1,50 @@
+Feature: renameFolders
+
+	Scenario Outline: Rename a folder using special characters
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the folder "simple-folder" to <to_folder_name>
+		Then the folder <to_folder_name> should be listed
+		Examples:
+		|to_folder_name|
+		|'सिमप्ले फोल्देर'    |
+		|'"quotes1"'   |
+		|"'quotes2'"   |		
+
+	Scenario Outline: Rename a folder that has special characters in its name
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the folder <from_name> to <to_name>
+		Then the folder <to_name> should be listed
+		Examples:
+		|from_name           |to_name               |
+		|"strängé नेपाली folder"|"strängé नेपाली folder-2"|
+		|"'single'quotes"    |"single-quotes"       |
+		|'"double"quotes'    |'double-quotes'       |
+
+	Scenario: Rename a folder using forbidden characters
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the folder "simple-folder" to one of these names
+		|simple/folder   |
+		|.htaccess       |
+		|simple\folder   |
+		|\\simple/folder |
+		|../simple-folder|
+		Then notifications should be displayed with the text
+		|Could not rename "simple-folder"|
+		|Could not rename "simple-folder"|
+		|Could not rename "simple-folder"|
+		|Could not rename "simple-folder"|
+		|Could not rename "simple-folder"|
+		And the folder "simple-folder" should be listed
+
+	Scenario: Rename a folder putting a name of a file which already exists
+		Given a regular user exists
+		And I am logged in as a regular user
+		And I am on the files page
+		When I rename the folder "simple-folder" to "lorem.txt"
+		Then near the folder "simple-folder" a tooltip with the text 'lorem.txt already exists' should be displayed
\ No newline at end of file

From a571dd71aab353de69a673677d2bec0e499e1f46 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 16:31:38 +0545
Subject: [PATCH 12/16] fix rename input field xpath

---
 tests/ui/features/lib/FilesPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ui/features/lib/FilesPage.php b/tests/ui/features/lib/FilesPage.php
index a5d369479cb8..7364a8d8c7ff 100644
--- a/tests/ui/features/lib/FilesPage.php
+++ b/tests/ui/features/lib/FilesPage.php
@@ -46,7 +46,7 @@ class FilesPage extends OwnCloudPage
 	protected $fileNamesXpath = "//span[@class='nametext']";
 	protected $fileRowFromNameXpath = "/../../..";
 	protected $fileActionXpath = "//a[@data-action='%s']";
-	protected $fileRenameInputXpath = "//*[@class='filename']";
+	protected $fileRenameInputXpath = "//input[contains(@class,'filename')]";
 	protected $fileBusyIndicatorXpath = ".//*[@class='thumbnail' and contains(@style,'loading')]";
 	protected $appContentId ="app-content";
 	protected $renameActionLabel = "Rename";

From c7c71b4de964f1299261db97136f04c0d4e7fe1d Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Fri, 19 May 2017 19:55:11 +0545
Subject: [PATCH 13/16] extend saucelab maxDuration to 1h

---
 tests/travis/start_behat_tests.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/travis/start_behat_tests.sh b/tests/travis/start_behat_tests.sh
index 600751c1f844..574a0bd66428 100644
--- a/tests/travis/start_behat_tests.sh
+++ b/tests/travis/start_behat_tests.sh
@@ -18,9 +18,11 @@ fi
 
 if [ "$BROWSER" == "firefox" ]
 then
-	EXTRA_CAPABILITIES='"seleniumVersion":"2.53.1"'
+	EXTRA_CAPABILITIES='"seleniumVersion":"2.53.1",'
 fi
 
+EXTRA_CAPABILITIES=$EXTRA_CAPABILITIES'"maxDuration":"3600"'
+
 echo "Running tests on '$BROWSER' ($BROWSER_VERSION) on $PLATFORM"
 export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"browser_name": "'$BROWSER'", "base_url" : "'$BASE_URL'","selenium2":{"capabilities": {"browser": "'$BROWSER'", "version": "'$BROWSER_VERSION'", "platform": "'$PLATFORM'", "name": "'$TRAVIS_REPO_SLUG' - '$TRAVIS_JOB_NUMBER'", "extra_capabilities": {'$EXTRA_CAPABILITIES'}}, "wd_host":"http://'$SAUCE_USERNAME:$SAUCE_ACCESS_KEY'@localhost:4445/wd/hub"}}}}' 
 

From c2677a3d6f7d6378363fd016db97e17625e807ce Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Mon, 22 May 2017 12:24:44 +0545
Subject: [PATCH 14/16] fix getQuotaOfUser to also get correct text if no field
 is selected

this was needed after updating mink-selenium2-driver
before update FF returned:
<option value="default" selected="selected">Default</option>

after update:
<option value="default">Default</option>

if no option is selected the first one is selected, so getQuotaOfUser now finds the value of the select field and then returns the text that is associated with that value
---
 tests/ui/features/lib/UsersPage.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/ui/features/lib/UsersPage.php b/tests/ui/features/lib/UsersPage.php
index 49fc797bcea9..1e31d207fe83 100644
--- a/tests/ui/features/lib/UsersPage.php
+++ b/tests/ui/features/lib/UsersPage.php
@@ -58,9 +58,8 @@ public function getQuotaOfUser($username)
 	{
 		$userTr = $this->findUserInTable($username);
 		$selectField = $userTr->find('xpath', $this->quotaSelectXpath);
-
 		$selectField = $selectField->find(
-			'xpath', "//option[@selected='selected']"
+			'xpath', "//option[@value='".$selectField->getValue()."']"
 		);
 
 		return $selectField->getText();

From 556d259ca701af3548b1f877296c9a3d90d3ee2a Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Mon, 22 May 2017 12:36:47 +0545
Subject: [PATCH 15/16] simplify scenarios by using "Background"

---
 tests/ui/features/renameFiles.feature   | 18 ++++--------------
 tests/ui/features/renameFolders.feature | 13 +++----------
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/tests/ui/features/renameFiles.feature b/tests/ui/features/renameFiles.feature
index 153112e9b24e..10073db08c04 100644
--- a/tests/ui/features/renameFiles.feature
+++ b/tests/ui/features/renameFiles.feature
@@ -1,9 +1,11 @@
 Feature: renameFiles
 
-	Scenario Outline: Rename a file using special characters
+	Background:
 		Given a regular user exists
 		And I am logged in as a regular user
 		And I am on the files page
+
+	Scenario Outline: Rename a file using special characters
 		When I rename the file "lorem.txt" to <to_file_name>
 		Then the file <to_file_name> should be listed
 		Examples:
@@ -14,9 +16,6 @@ Feature: renameFiles
 
 		
 	Scenario Outline: Rename a file that has special characters in its name
-		Given a regular user exists
-		And I am logged in as a regular user
-		And I am on the files page
 		When I rename the file <from_name> to <to_name>
 		Then the file <to_name> should be listed
 		Examples:
@@ -25,18 +24,12 @@ Feature: renameFiles
 		|"'single'quotes.txt"                 |"single-quotes.txt"                  |
 		|'"double"quotes.txt'                 |'double-quotes.txt'                  |
 
-	Scenario: Rename a file using special characters check its existence after page reload
-		Given a regular user exists
-		And I am logged in as a regular user
-		And I am on the files page
+	Scenario: Rename a file using special characters and check its existence after page reload
 		When I rename the file "lorem.txt" to "लोरेम।तयक्स्त $%&"
 		And the page is reloaded
 		Then the file "लोरेम।तयक्स्त $%&" should be listed
 
 	Scenario: Rename a file using forbidden characters
-		Given a regular user exists
-		And I am logged in as a regular user
-		And I am on the files page
 		When I rename the file "data.zip" to one of these names
 		|lorem/txt  |
 		|.htaccess  |
@@ -50,8 +43,5 @@ Feature: renameFiles
 		And the file "data.zip" should be listed
 
 	Scenario: Rename a file putting a name of a file which already exists
-		Given a regular user exists
-		And I am logged in as a regular user
-		And I am on the files page
 		When I rename the file "data.zip" to "lorem.txt"
 		Then near the file "data.zip" a tooltip with the text 'lorem.txt already exists' should be displayed
\ No newline at end of file
diff --git a/tests/ui/features/renameFolders.feature b/tests/ui/features/renameFolders.feature
index 80c351fe3d10..aa1d51b8e6e4 100644
--- a/tests/ui/features/renameFolders.feature
+++ b/tests/ui/features/renameFolders.feature
@@ -1,9 +1,11 @@
 Feature: renameFolders
 
-	Scenario Outline: Rename a folder using special characters
+	Background:
 		Given a regular user exists
 		And I am logged in as a regular user
 		And I am on the files page
+
+	Scenario Outline: Rename a folder using special characters
 		When I rename the folder "simple-folder" to <to_folder_name>
 		Then the folder <to_folder_name> should be listed
 		Examples:
@@ -13,9 +15,6 @@ Feature: renameFolders
 		|"'quotes2'"   |		
 
 	Scenario Outline: Rename a folder that has special characters in its name
-		Given a regular user exists
-		And I am logged in as a regular user
-		And I am on the files page
 		When I rename the folder <from_name> to <to_name>
 		Then the folder <to_name> should be listed
 		Examples:
@@ -25,9 +24,6 @@ Feature: renameFolders
 		|'"double"quotes'    |'double-quotes'       |
 
 	Scenario: Rename a folder using forbidden characters
-		Given a regular user exists
-		And I am logged in as a regular user
-		And I am on the files page
 		When I rename the folder "simple-folder" to one of these names
 		|simple/folder   |
 		|.htaccess       |
@@ -43,8 +39,5 @@ Feature: renameFolders
 		And the folder "simple-folder" should be listed
 
 	Scenario: Rename a folder putting a name of a file which already exists
-		Given a regular user exists
-		And I am logged in as a regular user
-		And I am on the files page
 		When I rename the folder "simple-folder" to "lorem.txt"
 		Then near the folder "simple-folder" a tooltip with the text 'lorem.txt already exists' should be displayed
\ No newline at end of file

From 5d5e5dcc73cb168692f4ef3bc92e066fb189f449 Mon Sep 17 00:00:00 2001
From: Artur Neumann <info@individual-it.net>
Date: Mon, 22 May 2017 12:38:56 +0545
Subject: [PATCH 16/16] get rid of tests files that are invalid in Windows

double quotes are not valid characters in filenames in Windows, having them in the repro would result Windows user not beeing able to clone
---
 tests/ui/features/renameFiles.feature              |  7 ++++++-
 tests/ui/features/renameFolders.feature            | 14 ++++++++++++--
 .../skeleton/\"double\"_and_'single'_quotes.txt"   |  4 ----
 .../\"double\"_and_'single'_quotes/for-git-commit" |  1 -
 "tests/ui/skeleton/\"double\"quotes.txt"           |  4 ----
 .../ui/skeleton/\"double\"quotes/for-git-commit"   |  1 -
 6 files changed, 18 insertions(+), 13 deletions(-)
 delete mode 100644 "tests/ui/skeleton/\"double\"_and_'single'_quotes.txt"
 delete mode 100644 "tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit"
 delete mode 100644 "tests/ui/skeleton/\"double\"quotes.txt"
 delete mode 100644 "tests/ui/skeleton/\"double\"quotes/for-git-commit"

diff --git a/tests/ui/features/renameFiles.feature b/tests/ui/features/renameFiles.feature
index 10073db08c04..10ff1e69de09 100644
--- a/tests/ui/features/renameFiles.feature
+++ b/tests/ui/features/renameFiles.feature
@@ -22,12 +22,17 @@ Feature: renameFiles
 		|from_name                            |to_name                              |
 		|"strängé filename (duplicate #2).txt"|"strängé filename (duplicate #3).txt"|
 		|"'single'quotes.txt"                 |"single-quotes.txt"                  |
-		|'"double"quotes.txt'                 |'double-quotes.txt'                  |
 
 	Scenario: Rename a file using special characters and check its existence after page reload
 		When I rename the file "lorem.txt" to "लोरेम।तयक्स्त $%&"
 		And the page is reloaded
 		Then the file "लोरेम।तयक्स्त $%&" should be listed
+		When I rename the file "लोरेम।तयक्स्त $%&" to '"double"quotes.txt'
+		And the page is reloaded
+		Then the file '"double"quotes.txt' should be listed
+		When I rename the file '"double"quotes.txt' to "no-double-quotes.txt"
+		And the page is reloaded
+		Then the file "no-double-quotes.txt" should be listed
 
 	Scenario: Rename a file using forbidden characters
 		When I rename the file "data.zip" to one of these names
diff --git a/tests/ui/features/renameFolders.feature b/tests/ui/features/renameFolders.feature
index aa1d51b8e6e4..3f5a2df0696c 100644
--- a/tests/ui/features/renameFolders.feature
+++ b/tests/ui/features/renameFolders.feature
@@ -12,7 +12,7 @@ Feature: renameFolders
 		|to_folder_name|
 		|'सिमप्ले फोल्देर'    |
 		|'"quotes1"'   |
-		|"'quotes2'"   |		
+		|"'quotes2'"   |
 
 	Scenario Outline: Rename a folder that has special characters in its name
 		When I rename the folder <from_name> to <to_name>
@@ -21,7 +21,17 @@ Feature: renameFolders
 		|from_name           |to_name               |
 		|"strängé नेपाली folder"|"strängé नेपाली folder-2"|
 		|"'single'quotes"    |"single-quotes"       |
-		|'"double"quotes'    |'double-quotes'       |
+
+	Scenario: Rename a folder using special characters and check its existence after page reload
+		When I rename the folder "simple-folder" to "लोरेम।तयक्स्त $%&"
+		And the page is reloaded
+		Then the folder "लोरेम।तयक्स्त $%&" should be listed
+		When I rename the folder "लोरेम।तयक्स्त $%&" to '"double"quotes'
+		And the page is reloaded
+		Then the folder '"double"quotes' should be listed
+		When I rename the folder '"double"quotes' to "no-double-quotes"
+		And the page is reloaded
+		Then the folder "no-double-quotes" should be listed
 
 	Scenario: Rename a folder using forbidden characters
 		When I rename the folder "simple-folder" to one of these names
diff --git "a/tests/ui/skeleton/\"double\"_and_'single'_quotes.txt" "b/tests/ui/skeleton/\"double\"_and_'single'_quotes.txt"
deleted file mode 100644
index b62c3fb2ffd3..000000000000
--- "a/tests/ui/skeleton/\"double\"_and_'single'_quotes.txt"
+++ /dev/null
@@ -1,4 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git "a/tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit" "b/tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit"
deleted file mode 100644
index 86459fd55043..000000000000
--- "a/tests/ui/skeleton/\"double\"_and_'single'_quotes/for-git-commit"
+++ /dev/null
@@ -1 +0,0 @@
-this file is only here because git does not allow to commit empty folders
\ No newline at end of file
diff --git "a/tests/ui/skeleton/\"double\"quotes.txt" "b/tests/ui/skeleton/\"double\"quotes.txt"
deleted file mode 100644
index b62c3fb2ffd3..000000000000
--- "a/tests/ui/skeleton/\"double\"quotes.txt"
+++ /dev/null
@@ -1,4 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git "a/tests/ui/skeleton/\"double\"quotes/for-git-commit" "b/tests/ui/skeleton/\"double\"quotes/for-git-commit"
deleted file mode 100644
index 86459fd55043..000000000000
--- "a/tests/ui/skeleton/\"double\"quotes/for-git-commit"
+++ /dev/null
@@ -1 +0,0 @@
-this file is only here because git does not allow to commit empty folders
\ No newline at end of file