conflicts resolved

Author: jasson99

tests/acceptance/features/bootstrap/OccContext.php

@@ -1213,32 +1213,34 @@ public function theFollowingLocalStoragesShouldExist(TableNode $mountPoints) {
 	 * @throws Exception
 	 */
 	public function theFollowingLocalStoragesShouldNotExist(TableNode $mountPoints) {
+		$createdLocalStorage = [];
 		$this->listLocalStorageMount();
 		$expectedLocalStorages = $mountPoints->getColumnsHash();
 		$commandOutput = \json_decode($this->featureContext->getStdOutOfOccCommand());
 		foreach ($commandOutput as $i) {
-			$this->createdLocalStorage[$i->mount_id] = \ltrim($i->mount_point, '/');
+			$createdLocalStorage[$i->mount_id] = \ltrim($i->mount_point, '/');
 		}
 		foreach ($expectedLocalStorages as $i) {
-			Assert::assertNotContains($i['localStorage'], $this->createdLocalStorage);
+			Assert::assertNotContains($i['localStorage'], $createdLocalStorage);
 		}
 	}
 
 	/**
-	 * @When the administrator deletes folder :folder using occ command
+	 * @When the administrator deletes local storage :folder using occ command
 	 *
 	 * @param string $folder
 	 *
 	 * @return void
 	 * @throws Exception
 	 */
 	public function administratorDeletesFolder($folder) {
+		$createdLocalStorage = [];
 		$this->listLocalStorageMount();
 		$commandOutput = \json_decode($this->featureContext->getStdOutOfOccCommand());
 		foreach ($commandOutput as $i) {
-			$this->createdLocalStorage[$i->mount_id] = \ltrim($i->mount_point, '/');
+			$createdLocalStorage[$i->mount_id] = \ltrim($i->mount_point, '/');
 		}
-		foreach ($this->createdLocalStorage as $key => $value) {
+		foreach ($createdLocalStorage as $key => $value) {
 			if ($value === $folder) {
 				$mount_id = $key;
 			}
@@ -1247,7 +1249,6 @@ public function administratorDeletesFolder($folder) {
 			throw  new Exception("Id not found for folder to be deleted");
 		}
 		$this->invokingTheCommand('files_external:delete --yes ' . $mount_id);
-		unset($this->createdLocalStorage[$mount_id]);
 	}
 
 	/**

tests/acceptance/features/cliLocalStorage/deleteLocalStorage.feature

@@ -9,7 +9,7 @@ Feature: create local storage from the command line
     And the administrator has created the local storage mount "new_local_storage"
     And the administrator has uploaded file with content "file in local storage" to "/local_storage2/file-in-local-storage.txt"
     And the administrator has uploaded file with content "new file" to "/new_local_storage/new-file"
-    When the administrator deletes folder "local_storage2" using occ command
+    When the administrator deletes local storage "local_storage2" using occ command
     Then the following local storage should not exist
       | localStorage   |
       | local_storage2 |