Adjust more Shares tests

tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md

@@ -513,5 +513,3 @@ Other free text and markdown formatting can be used elsewhere in the document if
 
 ### Shares folder cannot be deleted and is always visible
 -  [webUIDeleteFilesFolders/deleteFilesFolders.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L77)
--  [webUIDeleteFilesFolders/deleteFilesFolders.feature:89](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L89)
--  [webUISharingAcceptShares/acceptShares.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L72)

tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature

@@ -96,10 +96,12 @@ Feature: deleting files and folders
       | name          |
       | lorem.txt     |
       | simple-folder |
+      | Shares        |
     And the user batch deletes the marked files using the webUI
     Then as "Alice" file "lorem.txt" should exist in the server
     And as "Alice" folder "simple-folder" should exist in the server
     And folder "simple-folder" should be listed on the webUI
+    And folder "Shares" should be listed on the webUI
     And file "lorem.txt" should be listed on the webUI
     # Check just an example of a file that should not exist any more
     But as "Alice" file "data.zip" should not exist in the server

tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature

@@ -68,17 +68,33 @@ Feature: accept/decline shares coming from internal users
     Then folder "simple-folder" shared by "Alice Hansen" should be in "Declined" state on the webUI
     And file "testimage.jpg" shared by "Alice Hansen" should be in "Declined" state on the webUI
 
-
-  Scenario: User receives files when auto accept share is disabled
+  @skipOnOCIS
+  Scenario: User receives files when auto accept share is disabled - oC10 behavior
     Given user "Alice" has created file "toshare.txt" in the server
     And user "Alice" has uploaded file with content "test" to "toshare.txt" in the server
     And user "Alice" has shared file "toshare.txt" with user "Brian" in the server
     When the user browses to the shared-with-me page
     Then file "toshare.txt" shared by "Alice Hansen" should be in "Pending" state on the webUI
     When the user browses to the files page
     Then file "toshare.txt" should not be listed on the webUI
+    # On oC10, the Shares folder only appears after there is a received shared
+    # resource. So it should not exist at this point.
     And folder "Shares" should not be listed on the webUI
 
+  @skipOnOC10
+  Scenario: User receives files when auto accept share is disabled - oCIS behavior
+    Given user "Alice" has created file "toshare.txt" in the server
+    And user "Alice" has uploaded file with content "test" to "toshare.txt" in the server
+    And user "Alice" has shared file "toshare.txt" with user "Brian" in the server
+    When the user browses to the shared-with-me page
+    Then file "toshare.txt" shared by "Alice Hansen" should be in "Pending" state on the webUI
+    When the user browses to the files page
+    Then file "toshare.txt" should not be listed on the webUI
+    # The Shares folder always exists on oCIS, check inside it to see that the
+    # received shared file is not listed, because the share is pending.
+    When the user opens folder "Shares" using the webUI
+    Then file "toshare.txt" should not be listed on the webUI
+
 
   Scenario: receive shares with same name from different users
     Given user "Carol" has been created with default attributes and without skeleton files in the server