Enable json language injection for .feature files and reformat them.

Author: Socolin

backend/.editorconfig

@@ -84,10 +84,6 @@ indent_size = 2
 indent_style = space
 indent_size = 4
 
-[*.feature]
-indent_style = space
-indent_size = 4
-
 [{*.bash,*.sh,*.zsh}]
 indent_style = space
 indent_size = 2
@@ -104,3 +100,7 @@ tab_width = 4
 [*.nginx]
 indent_style = space
 tab_width = 4
+
+[*.feature]
+indent_style = space
+indent_size = 2

backend/Naheulbook.slnx.DotSettings

@@ -29,6 +29,7 @@ public static class ServiceCollectionExtensions
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=F9BE8C6944C15E429D07F152F09A7A68/Text/@EntryValue">private static readonly DateTimeOffset NowUtc = new DateTimeOffset(2020, 12, 8, 10, 12, 8, TimeSpan.Zero);</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Debilibeuk/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=homme/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mankdebol/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Melkor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Middlewares/@EntryIndexedValue">True</s:Boolean>

backend/tests/Naheulbook.Tests.Functional/Code/Extensions/StringExtensions.cs

@@ -19,7 +19,7 @@ public static string ExecuteReplacement(this string str, ScenarioContext context
         var replacementTokens = ListReplacementTokens(str);
         var missingKeys = new List<string>();
 
-        foreach (var replacementToken in replacementTokens)
+        foreach (var (kind, replacementToken) in replacementTokens)
         {
             try
             {
@@ -38,7 +38,19 @@ public static string ExecuteReplacement(this string str, ScenarioContext context
                         break;
                 }
 
-                str = str.Replace($"${{{replacementToken}}}", replacementValue);
+                switch (kind)
+                {
+                    case ReplacementKind.None:
+                        break;
+                    case ReplacementKind.Raw:
+                        str = str.Replace($"${{{replacementToken}}}", replacementValue);
+                        break;
+                    case ReplacementKind.Quoted:
+                        str = str.Replace($"\"!{{{replacementToken}}}\"", replacementValue);
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
             }
             catch (ReplacementKeyNotfoundException ex)
             {
@@ -137,36 +149,49 @@ private static bool IsArrayAccessor(string propertyName)
         return propertyName.StartsWith("[") && propertyName.EndsWith("]");
     }
 
-    private static IEnumerable<string> ListReplacementTokens(string str)
+    private static IEnumerable<(ReplacementKind, string)> ListReplacementTokens(string str)
     {
         var currentToken = new StringBuilder();
         var inReplacement = false;
+        var replacementKind = ReplacementKind.None;
         var previousChar = '\0';
-        var tokens = new List<string>();
 
         foreach (var c in str)
         {
             if (previousChar == '$' && c == '{')
             {
                 inReplacement = true;
+                replacementKind = ReplacementKind.Raw;
+                currentToken.Clear();
+            }
+            else if (previousChar == '!' && c == '{')
+            {
+                inReplacement = true;
+                replacementKind = ReplacementKind.Quoted;
                 currentToken.Clear();
             }
             else if (inReplacement && c == '}')
             {
-                tokens.Add(currentToken.ToString());
+                yield return (replacementKind, currentToken.ToString());
+                replacementKind = ReplacementKind.None;
                 inReplacement = false;
             }
             else if (inReplacement)
                 currentToken.Append(c);
 
             previousChar = c;
         }
-
-        return tokens;
     }
 
     private class ReplacementKeyNotfoundException(string key) : Exception
     {
         public string Key { get; } = key;
     }
+
+    public enum ReplacementKind
+    {
+        None,
+        Raw,
+        Quoted,
+    }
 }

backend/tests/Naheulbook.Tests.Functional/Functionals/Authentication.feature

@@ -2,7 +2,7 @@ Feature: Authentication
 
   Scenario: Can create a user with a username and a password and validate his email
     When performing a POST to the url "/api/v2/users/" with the following json content
-    """
+    """json
     {
       "username": "[email protected]",
       "password": "iHE1vAqAKZtoPdWDXW9lgOkI+SWtGV/UB59fPU6Occ602wQs1xsOywVDPLy5z6DS"
@@ -12,7 +12,7 @@ Feature: Authentication
     And a mail validation mail has been sent to "[email protected]"
 
     When performing a POST to the url "/api/v2/users/[email protected]/validate" with the following json content
-    """
+    """json
     {
       "activationCode": "${ActivationCode}"
     }
@@ -23,11 +23,10 @@ Feature: Authentication
     Given a user identified by a password
 
     When performing a POST to the url "/api/v2/users/${Username}/jwt" with the following json content
-    """
+    """json
     {
       "password": "${Password}"
     }
     """
     Then the response status code is 200
-    And the response content contains a valid JWT
-
+    And the response content contains a valid JWT

backend/tests/Naheulbook.Tests.Functional/Functionals/Calendar.feature

@@ -6,14 +6,14 @@ Feature: Calendar
     When performing a GET to the url "/api/v2/calendar/"
     Then the response status code is 200
     And the response should contains the following json
-    """
+    """json
     [
       {
-        "id": ${Calendar.Id},
+        "id": "!{Calendar.Id}",
         "name":"${Calendar.Name}",
-        "startDay": ${Calendar.StartDay},
-        "endDay": ${Calendar.EndDay},
+        "startDay": "!{Calendar.StartDay}",
+        "endDay": "!{Calendar.EndDay}",
         "note": "${Calendar.Note}"
       }
     ]
-    """
+    """