Resolving merge problems

Author: Fernando López

doc/Refactoring.md

@@ -16,6 +16,17 @@ This refactoring plan aims to improve modularity, maintainability, test clarity,
   - [ ] Code duplication
   - [ ] Docker reliability
   - [ ] BDD feature file readability
+- Missing tutorials:
+  - NGSIv2:
+    - [ ] 106. Subscribing to Changes in Context
+  - NGSI-LD
+    - [ ] 104. Concise Payloads
+    - [ ] (@flopezag) 104. Entity Relationships refactor to 106. Entity Relationships 
+    - [ ] (@flopezag) 105. Merge-Patch and Put
+    - [ ] 106. Subscription  refactor to  107. Subscriptions
+    - [ ] 108. Registrations
+    - [ ] 109. Temporal Operations
+    - [ ] 110. Extended Properties
 
 ---
 
@@ -29,8 +40,11 @@ This refactoring plan aims to improve modularity, maintainability, test clarity,
   - [ ] NGSI-v2 and NGSI-LD split
   - [ ] Rename `config.json` → `ngsi_v2.json`, `ngsi_ld.json`
 - [ ] Group `.feature` files:
+    
     features/
+    
     ├── ngsi_v2/
+    
     └── ngsi_ld/
 - [ ] Unify or reuse shared step definitions.
 

features/403.Securing_Application_Access.feature

@@ -13,7 +13,7 @@ Feature: Test tutorial 403.Securing application access
         Given I set "ClientID" to "tutorial-dckr-site-0000-xpresswebapp"
         And   I set "ClientSecret" to "tutorial-dckr-site-0000-clientsecret"
         When  I calculate the base64 of this ClientId and ClientSecret
-        Then  I obtain the value "dHV0b3JpYWwtZGNrci1zaXRlLTAwMDAteHByZXNzd2ViYXBwOnR1dG9yaWFsLWRja3Itc2l0ZS0wMDAwLWNsaWVudHNlY3JldAo=="
+        Then  I obtain the value "dHV0b3JpYWwtZGNrci1zaXRlLTAwMDAteHByZXNzd2ViYXBwOnR1dG9yaWFsLWRja3Itc2l0ZS0wMDAwLWNsaWVudHNlY3JldA=="
 
     Scenario: 01 - Logging-in with a password
         When  I set the Authorization header token with the calculated value
@@ -24,7 +24,7 @@ Feature: Test tutorial 403.Securing application access
         And   I send a POST HTTP request to that url
         Then  I receive a HTTP "200" status code from Keyrock with the following data
             | access_token | token_type | expires_in | refresh_token |
-            | any          | Bearer     | 3599       | any           |
+            | any          | bearer     | 3599       | any           |
 
     Scenario: 02 - Retrieving user details from an access token
         When  I set the the user url with the previous access_token
@@ -40,7 +40,7 @@ Feature: Test tutorial 403.Securing application access
         And   I send a POST HTTP request to that url
         Then  I receive a HTTP "200" status code from Keyrock with the following data
             | access_token | token_type | expires_in |
-            | any          | Bearer     | 3599       |
+            | any          | bearer     | 3599       |
 
     Scenario: 04 - Availability check
         When  I set the Authorization header token with the calculated value
@@ -51,7 +51,7 @@ Feature: Test tutorial 403.Securing application access
         And   I send a POST HTTP request to that url
         Then  I receive a HTTP "200" status code from Keyrock with the following data
             | access_token | token_type | expires_in | refresh_token |
-            | any          | Bearer     | 3599       | any           |
+            | any          | bearer     | 3599       | any           |
 
     Scenario: 05 - Refresh access token
         When  I set the Authorization header token with the calculated value
@@ -62,7 +62,7 @@ Feature: Test tutorial 403.Securing application access
         And   I send a POST HTTP request to that url
         Then  I receive a HTTP "200" status code from Keyrock with the following data
             | access_token | token_type | expires_in | refresh_token |
-            | any          | Bearer     | 3599       | any           |
+            | any          | bearer     | 3599       | any           |
 
     # There should be clarified that Application ID is equal to Client ID in the tutorial
     # This scenario works basically because there is no response in the tutorial, therefore

features/data/101.Getting_started/response101-01.excludes

@@ -1,3 +1,5 @@
+root['orion']['orionld version']
+root['orion']['orion version']
 root['orion']['version']
 root['orion']['git_hash']
 root['orion']['compile_time']

features/data/101.Getting_started/response101-01.json

@@ -8,16 +8,6 @@
     "compiled_in": "buildkitsandbox",
     "release_date": "Mon Jun 12 16:55:20 UTC 2023",
     "machine": "x86_64",
-    "doc": "https://fiware-orion.rtfd.io/en/3.10.1/",
-    "libversions": {
-      "boost": "1_74",
-      "libcurl": "libcurl/7.74.0 OpenSSL/1.1.1n zlib/1.2.12 brotli/1.0.9 libidn2/2.3.0 libpsl/0.21.0 (+libidn2/2.3.0) libssh2/1.9.0 nghttp2/1.43.0 librtmp/2.3",
-      "libmosquitto": "2.0.15",
-      "libmicrohttpd": "0.9.76",
-      "openssl": "1.1",
-      "rapidjson": "1.1.0",
-      "mongoc": "1.23.1",
-      "bson": "1.23.1"
-    }
+    "doc": "https://fiware-orion.rtfd.io/en/3.10.1/"
   }
-}
+}

features/data/103.CRUD-Operations/response101-01.excludes

@@ -0,0 +1,8 @@
+root['orion']['orionld version']
+root['orion']['orion version']
+root['orion']['version']
+root['orion']['git_hash']
+root['orion']['compile_time']
+root['orion']['release_date']
+root['orion']['doc']
+root['orion']['uptime']

features/data/103.CRUD-Operations/response101-01.json

@@ -8,16 +8,6 @@
     "compiled_in": "buildkitsandbox",
     "release_date": "Mon Jun 12 16:55:20 UTC 2023",
     "machine": "x86_64",
-    "doc": "https://fiware-orion.rtfd.io/en/3.10.1/",
-    "libversions": {
-      "boost": "1_74",
-      "libcurl": "libcurl/7.74.0 OpenSSL/1.1.1n zlib/1.2.12 brotli/1.0.9 libidn2/2.3.0 libpsl/0.21.0 (+libidn2/2.3.0) libssh2/1.9.0 nghttp2/1.43.0 librtmp/2.3",
-      "libmosquitto": "2.0.15",
-      "libmicrohttpd": "0.9.76",
-      "openssl": "1.1",
-      "rapidjson": "1.1.0",
-      "mongoc": "1.23.1",
-      "bson": "1.23.1"
-    }
+    "doc": "https://fiware-orion.rtfd.io/en/3.10.1/"
   }
-}
+}