Merge pull request #215 from owncloud/check-CI-20180724

Fixup refactored core gherkin steps

Author: individual-it

tests/acceptance/features/apiNotifications/delete-notifications.feature

@@ -3,7 +3,7 @@ Feature: delete-notifications
 
   Background:
     Given user "test1" has been created
-    And using API version "2"
+    And using OCS API version "2"
 
   Scenario: Delete first notification
     When user "test1" is sent a notification

tests/acceptance/features/apiNotifications/email-notifications.feature

@@ -5,7 +5,7 @@ Feature: notifications-content
 		Given these users have been created:
 			|username|password|displayname|email       |
 			|user1   |1234    |User One   |u1@oc.com.np|
-		And using API version "2"
+		And using OCS API version "2"
 
 	Scenario: Create notification
 		When the user "user1" sets the email notification option to "always" using the API

tests/acceptance/features/apiNotifications/notifications-content.feature

@@ -3,7 +3,7 @@ Feature: notifications-content
 
   Background:
     Given user "test1" has been created
-    And using API version "2"
+    And using OCS API version "2"
 
   Scenario: Create notification
     When user "test1" is sent a notification with

tests/acceptance/features/apiNotifications/statuscodes.feature

@@ -4,23 +4,23 @@ Feature: statuscodes
   Background:
     Given user "test1" has been created
     And as user "test1"
-    And using API version "2"
+    And using OCS API version "2"
 
   Scenario: Status code when reading notifications with notifiers and without notifications
-    When the user sends HTTP method "GET" to API endpoint "/apps/notifications/api/v1/notifications?format=json"
+    When the user sends HTTP method "GET" to OCS API endpoint "/apps/notifications/api/v1/notifications?format=json"
     Then the HTTP status code should be "200"
     And the list of notifications should have 0 entries
 
   Scenario: Status code when reading notifications with notifiers and notification
     Given user "test1" has been sent a notification
-    When the user sends HTTP method "GET" to API endpoint "/apps/notifications/api/v1/notifications?format=json"
+    When the user sends HTTP method "GET" to OCS API endpoint "/apps/notifications/api/v1/notifications?format=json"
     Then the HTTP status code should be "200"
     And the list of notifications should have 1 entry
 
   Scenario: Status code when reading notifications with notifiers and notifications
     Given user "test1" has been sent a notification
     And user "test1" has been sent a notification
     And user "test1" has been sent a notification
-    When the user sends HTTP method "GET" to API endpoint "/apps/notifications/api/v1/notifications?format=json"
+    When the user sends HTTP method "GET" to OCS API endpoint "/apps/notifications/api/v1/notifications?format=json"
     Then the HTTP status code should be "200"
     And the list of notifications should have 3 entries

tests/acceptance/features/bootstrap/NotificationsContext.php

@@ -51,7 +51,7 @@ class NotificationsContext implements Context {
 	 * @return void
 	 */
 	public function hasBeenSentANotification($user) {
-		$this->featureContext->userSendingTo(
+		$this->featureContext->userSendsToOcsApiEndpoint(
 			$user,
 			'POST', '/apps/testing/api/v1/notifications'
 		);
@@ -81,7 +81,7 @@ public function hasBeenSentANotificationWith($user, TableNode $formData) {
 		}
 		$formData = new TableNode($rows);
 
-		$this->featureContext->userSendsHTTPMethodToAPIEndpointWithBody(
+		$this->featureContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
 			$this->featureContext->getAdminUsername(),
 			'POST', '/apps/testing/api/v1/notifications', $formData
 		);
@@ -156,7 +156,7 @@ public function deleteNotification($user, $firstOrLast) {
 				reset($lastNotificationIds)
 			);
 		}
-		$this->featureContext->userSendingTo(
+		$this->featureContext->userSendsToOcsApiEndpoint(
 			$user,
 			'DELETE',
 			'/apps/notifications/api/v1/notifications/' . $this->notificationsCoreContext->getDeletedNotification()

tests/acceptance/features/webUINotifications/displayNotificationsOnWebUI.feature

@@ -11,7 +11,7 @@ So that I can stay informed
 			|user1   |1234    |User One   |u1@oc.com.np|
 		And the user has browsed to the login page
 		And the user has logged in with username "user1" and password "1234" using the webUI
-		And using API version "2"
+		And using OCS API version "2"
 
 	Scenario: Create notifications
 		When user "user1" is sent a notification with