Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-07-05 23:52:28 +0300
committerGitHub <noreply@github.com>2020-07-05 23:52:28 +0300
commit3333c885c0ae6e0c63aafe891e946838183f9781 (patch)
treec99d2cbedc4e0d803067afcf8ce71f814b279fbe /build
parente900f424ce16c40b85adc89387ab3b369140f532 (diff)
parent72f853424bd22f06ef694d59c508972c208af342 (diff)
Merge pull request #21264 from stweil/master
build: Fix some typos (most of them found by codespell)
Diffstat (limited to 'build')
-rw-r--r--build/integration/features/bootstrap/CommandLineContext.php8
-rw-r--r--build/integration/features/external-storage.feature2
-rw-r--r--build/integration/features/transfer-ownership.feature88
-rw-r--r--build/integration/features/webdav-related.feature2
4 files changed, 50 insertions, 50 deletions
diff --git a/build/integration/features/bootstrap/CommandLineContext.php b/build/integration/features/bootstrap/CommandLineContext.php
index bf999fd2050..dda137d654f 100644
--- a/build/integration/features/bootstrap/CommandLineContext.php
+++ b/build/integration/features/bootstrap/CommandLineContext.php
@@ -95,9 +95,9 @@ class CommandLineContext implements \Behat\Behat\Context\Context {
}
/**
- * @When /^transfering ownership from "([^"]+)" to "([^"]+)"/
+ * @When /^transferring ownership from "([^"]+)" to "([^"]+)"/
*/
- public function transferingOwnership($user1, $user2) {
+ public function transferringOwnership($user1, $user2) {
if ($this->runOcc(['files:transfer-ownership', $user1, $user2]) === 0) {
$this->lastTransferPath = $this->findLastTransferFolderForUser($user1, $user2);
} else {
@@ -107,9 +107,9 @@ class CommandLineContext implements \Behat\Behat\Context\Context {
}
/**
- * @When /^transfering ownership of path "([^"]+)" from "([^"]+)" to "([^"]+)"/
+ * @When /^transferring ownership of path "([^"]+)" from "([^"]+)" to "([^"]+)"/
*/
- public function transferingOwnershipPath($path, $user1, $user2) {
+ public function transferringOwnershipPath($path, $user1, $user2) {
$path = '--path=' . $path;
if ($this->runOcc(['files:transfer-ownership', $path, $user1, $user2]) === 0) {
$this->lastTransferPath = $this->findLastTransferFolderForUser($user1, $user2);
diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature
index e1e9ff8860b..59a873dd816 100644
--- a/build/integration/features/external-storage.feature
+++ b/build/integration/features/external-storage.feature
@@ -24,7 +24,7 @@ Feature: external-storage
| token | A_TOKEN |
| mimetype | httpd/unix-directory |
- Scenario: Shares dont overwrite external storages
+ Scenario: Shares don't overwrite external storages
Given user "user0" exists
And user "user1" exists
And As an "user0"
diff --git a/build/integration/features/transfer-ownership.feature b/build/integration/features/transfer-ownership.feature
index a0959db6c17..70022483d48 100644
--- a/build/integration/features/transfer-ownership.feature
+++ b/build/integration/features/transfer-ownership.feature
@@ -1,39 +1,39 @@
Feature: transfer-ownership
- Scenario: transfering ownership of a file
+ Scenario: transferring ownership of a file
Given user "user0" exists
And user "user1" exists
And User "user0" uploads file "data/textfile.txt" to "/somefile.txt"
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user1"
And using received transfer folder of "user1" as dav path
Then Downloaded content when downloading file "/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of a folder
+ Scenario: transferring ownership of a folder
Given user "user0" exists
And user "user1" exists
And User "user0" created a folder "/test"
And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user1"
And using received transfer folder of "user1" as dav path
Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of file shares
+ Scenario: transferring ownership of file shares
Given user "user0" exists
And user "user1" exists
And user "user2" exists
And User "user0" uploads file "data/textfile.txt" to "/somefile.txt"
And file "/somefile.txt" of user "user0" is shared with user "user2" with permissions 19
And user "user2" accepts last share
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user2"
Then Downloaded content when downloading file "/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of folder shared with third user
+ Scenario: transferring ownership of folder shared with third user
Given user "user0" exists
And user "user1" exists
And user "user2" exists
@@ -41,26 +41,26 @@ Feature: transfer-ownership
And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
And folder "/test" of user "user0" is shared with user "user2" with permissions 31
And user "user2" accepts last share
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user2"
Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of folder shared with transfer recipient
+ Scenario: transferring ownership of folder shared with transfer recipient
Given user "user0" exists
And user "user1" exists
And User "user0" created a folder "/test"
And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
And folder "/test" of user "user0" is shared with user "user1" with permissions 31
And user "user1" accepts last share
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user1"
Then as "user1" the folder "/test" does not exist
And using received transfer folder of "user1" as dav path
And Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of folder doubly shared with third user
+ Scenario: transferring ownership of folder doubly shared with third user
Given group "group1" exists
And user "user0" exists
And user "user1" exists
@@ -72,12 +72,12 @@ Feature: transfer-ownership
And user "user2" accepts last share
And folder "/test" of user "user0" is shared with user "user2" with permissions 31
And user "user2" accepts last share
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user2"
Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of file shares to user with the same id as the group
+ Scenario: transferring ownership of file shares to user with the same id as the group
Given user "user0" exists
And user "test" exists
And user "user2" exists
@@ -86,35 +86,35 @@ Feature: transfer-ownership
And User "user0" uploads file "data/textfile.txt" to "/somefile.txt"
And file "/somefile.txt" of user "user0" is shared with group "test"
And user "user2" accepts last share
- When transfering ownership from "user0" to "test"
+ When transferring ownership from "user0" to "test"
And the command was successful
And As an "user2"
Then Downloaded content when downloading file "/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership does not transfer received shares
+ Scenario: transferring ownership does not transfer received shares
Given user "user0" exists
And user "user1" exists
And user "user2" exists
And User "user2" created a folder "/test"
And folder "/test" of user "user2" is shared with user "user0" with permissions 31
And user "user0" accepts last share
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user1"
And using received transfer folder of "user1" as dav path
Then as "user1" the folder "/test" does not exist
@local_storage
- Scenario: transfering ownership does not transfer external storage
+ Scenario: transferring ownership does not transfer external storage
Given user "user0" exists
And user "user1" exists
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
And the command was successful
And As an "user1"
And using received transfer folder of "user1" as dav path
Then as "user1" the folder "/local_storage" does not exist
- Scenario: transfering ownership does not fail with shared trashed files
+ Scenario: transferring ownership does not fail with shared trashed files
Given user "user0" exists
And user "user1" exists
And user "user2" exists
@@ -123,33 +123,33 @@ Feature: transfer-ownership
And folder "/sub/test" of user "user0" is shared with user "user2" with permissions 31
And user "user2" accepts last share
And User "user0" deletes folder "/sub"
- When transfering ownership from "user0" to "user1"
+ When transferring ownership from "user0" to "user1"
Then the command was successful
- Scenario: transfering ownership fails with invalid source user
+ Scenario: transferring ownership fails with invalid source user
Given user "user0" exists
- When transfering ownership from "invalid_user" to "user0"
+ When transferring ownership from "invalid_user" to "user0"
Then the command error output contains the text "Unknown source user"
And the command failed with exit code 1
- Scenario: transfering ownership fails with invalid target user
+ Scenario: transferring ownership fails with invalid target user
Given user "user0" exists
- When transfering ownership from "user0" to "invalid_user"
+ When transferring ownership from "user0" to "invalid_user"
Then the command error output contains the text "Unknown target user"
And the command failed with exit code 1
- Scenario: transfering ownership of a folder
+ Scenario: transferring ownership of a folder
Given user "user0" exists
And user "user1" exists
And User "user0" created a folder "/test"
And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
- When transfering ownership of path "test" from "user0" to "user1"
+ When transferring ownership of path "test" from "user0" to "user1"
And the command was successful
And As an "user1"
And using received transfer folder of "user1" as dav path
Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of file shares
+ Scenario: transferring ownership of file shares
Given user "user0" exists
And user "user1" exists
And user "user2" exists
@@ -157,12 +157,12 @@ Feature: transfer-ownership
And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
And file "/test/somefile.txt" of user "user0" is shared with user "user2" with permissions 19
And user "user2" accepts last share
- When transfering ownership of path "test" from "user0" to "user1"
+ When transferring ownership of path "test" from "user0" to "user1"
And the command was successful
And As an "user2"
Then Downloaded content when downloading file "/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of folder shared with third user
+ Scenario: transferring ownership of folder shared with third user
Given user "user0" exists
And user "user1" exists
And user "user2" exists
@@ -170,26 +170,26 @@ Feature: transfer-ownership
And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
And folder "/test" of user "user0" is shared with user "user2" with permissions 31
And user "user2" accepts last share
- When transfering ownership of path "test" from "user0" to "user1"
+ When transferring ownership of path "test" from "user0" to "user1"
And the command was successful
And As an "user2"
Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of folder shared with transfer recipient
+ Scenario: transferring ownership of folder shared with transfer recipient
Given user "user0" exists
And user "user1" exists
And User "user0" created a folder "/test"
And User "user0" uploads file "data/textfile.txt" to "/test/somefile.txt"
And folder "/test" of user "user0" is shared with user "user1" with permissions 31
And user "user1" accepts last share
- When transfering ownership of path "test" from "user0" to "user1"
+ When transferring ownership of path "test" from "user0" to "user1"
And the command was successful
And As an "user1"
Then as "user1" the folder "/test" does not exist
And using received transfer folder of "user1" as dav path
And Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership of folder doubly shared with third user
+ Scenario: transferring ownership of folder doubly shared with third user
Given group "group1" exists
And user "user0" exists
And user "user1" exists
@@ -201,12 +201,12 @@ Feature: transfer-ownership
And user "user2" accepts last share
And folder "/test" of user "user0" is shared with user "user2" with permissions 31
And user "user2" accepts last share
- When transfering ownership of path "test" from "user0" to "user1"
+ When transferring ownership of path "test" from "user0" to "user1"
And the command was successful
And As an "user2"
Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
- Scenario: transfering ownership does not transfer received shares
+ Scenario: transferring ownership does not transfer received shares
Given user "user0" exists
And user "user1" exists
And user "user2" exists
@@ -215,39 +215,39 @@ Feature: transfer-ownership
And folder "/test" of user "user2" is shared with user "user0" with permissions 31
And user "user0" accepts last share
And User "user0" moved folder "/test" to "/sub/test"
- When transfering ownership of path "sub" from "user0" to "user1"
+ When transferring ownership of path "sub" from "user0" to "user1"
And the command was successful
And As an "user1"
And using received transfer folder of "user1" as dav path
Then as "user1" the folder "/sub/test" does not exist
- Scenario: transfering ownership does not transfer external storage
+ Scenario: transferring ownership does not transfer external storage
Given user "user0" exists
And user "user1" exists
And User "user0" created a folder "/sub"
- When transfering ownership of path "sub" from "user0" to "user1"
+ When transferring ownership of path "sub" from "user0" to "user1"
And the command was successful
And As an "user1"
And using received transfer folder of "user1" as dav path
Then as "user1" the folder "/local_storage" does not exist
- Scenario: transfering ownership fails with invalid source user
+ Scenario: transferring ownership fails with invalid source user
Given user "user0" exists
And User "user0" created a folder "/sub"
- When transfering ownership of path "sub" from "invalid_user" to "user0"
+ When transferring ownership of path "sub" from "invalid_user" to "user0"
Then the command error output contains the text "Unknown source user"
And the command failed with exit code 1
- Scenario: transfering ownership fails with invalid target user
+ Scenario: transferring ownership fails with invalid target user
Given user "user0" exists
And User "user0" created a folder "/sub"
- When transfering ownership of path "sub" from "user0" to "invalid_user"
+ When transferring ownership of path "sub" from "user0" to "invalid_user"
Then the command error output contains the text "Unknown target user"
And the command failed with exit code 1
- Scenario: transfering ownership fails with invalid path
+ Scenario: transferring ownership fails with invalid path
Given user "user0" exists
And user "user1" exists
- When transfering ownership of path "test" from "user0" to "user1"
+ When transferring ownership of path "test" from "user0" to "user1"
Then the command error output contains the text "Unknown target user"
And the command failed with exit code 1
diff --git a/build/integration/features/webdav-related.feature b/build/integration/features/webdav-related.feature
index 3a488775a22..66652e6fa26 100644
--- a/build/integration/features/webdav-related.feature
+++ b/build/integration/features/webdav-related.feature
@@ -210,7 +210,7 @@ Feature: webdav-related
|{DAV:}quota-available-bytes|
Then the single response should contain a property "{DAV:}quota-available-bytes" with value "592"
- Scenario: Retrieving folder quota when quota is set and a file was recieved
+ Scenario: Retrieving folder quota when quota is set and a file was received
Given using old dav path
And As an "admin"
And user "user0" exists