Skip to content

Commit 3f61be0

Browse files
chore(repo): properly append line in body and footer
Otherwise the \n was seen literraly and thus only one big line was analysed.
1 parent 3ee2cf0 commit 3f61be0

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

validator.bats

+12-10
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ BROKEN:
120120
[[ $GLOBAL_HEADER == "plop plop" ]]
121121
[[ $GLOBAL_BODY == "" ]]
122122
[[ $GLOBAL_JIRA == "" ]]
123-
[[ $GLOBAL_FOOTER == "- plop\n- plop\n" ]]
123+
[[ $GLOBAL_FOOTER == "- plop"$'\n'"- plop"$'\n' ]]
124124
}
125125

126126
@test "structure: valid commit message with header, jira and broken" {
@@ -135,7 +135,7 @@ BROKEN:
135135
[[ $GLOBAL_HEADER == "plop plop" ]]
136136
[[ $GLOBAL_BODY == "" ]]
137137
[[ $GLOBAL_JIRA == "ABC-1234" ]]
138-
[[ $GLOBAL_FOOTER == "- plop\n- plop\n" ]]
138+
[[ $GLOBAL_FOOTER == "- plop"$'\n'"- plop"$'\n' ]]
139139
}
140140

141141
@test "structure: valid commit message with header and body" {
@@ -145,7 +145,7 @@ hello"
145145

146146
validate_overall_structure "$COMMIT"
147147
[[ $GLOBAL_HEADER == "plop plop" ]]
148-
[[ $GLOBAL_BODY == "hello\n" ]]
148+
[[ $GLOBAL_BODY == "hello"$'\n' ]]
149149
[[ $GLOBAL_JIRA == "" ]]
150150
[[ $GLOBAL_FOOTER == "" ]]
151151
}
@@ -162,7 +162,7 @@ toto"
162162

163163
validate_overall_structure "$COMMIT"
164164
[[ $GLOBAL_HEADER == "plop plop" ]]
165-
[[ $GLOBAL_BODY == "hello\nplopplop\nplopplop\ntoto\n" ]]
165+
[[ $GLOBAL_BODY == "hello"$'\n'"plopplop"$'\n'"plopplop"$'\n'"toto"$'\n' ]]
166166
[[ $GLOBAL_JIRA == "" ]]
167167
[[ $GLOBAL_FOOTER == "" ]]
168168
}
@@ -181,7 +181,7 @@ ABC-1234"
181181

182182
validate_overall_structure "$COMMIT"
183183
[[ $GLOBAL_HEADER == "plop plop" ]]
184-
[[ $GLOBAL_BODY == "hello\nplopplop\nplopplop\ntoto\n" ]]
184+
[[ $GLOBAL_BODY == "hello"$'\n'"plopplop"$'\n'"plopplop"$'\n'"toto"$'\n' ]]
185185
[[ $GLOBAL_JIRA == "ABC-1234" ]]
186186
[[ $GLOBAL_FOOTER == "" ]]
187187
}
@@ -202,9 +202,9 @@ BROKEN:
202202

203203
validate_overall_structure "$COMMIT"
204204
[[ $GLOBAL_HEADER == "plop plop" ]]
205-
[[ $GLOBAL_BODY == "hello\nplopplop\nplopplop\ntoto\n" ]]
205+
[[ $GLOBAL_BODY == "hello"$'\n'"plopplop"$'\n'"plopplop"$'\n'"toto"$'\n' ]]
206206
[[ $GLOBAL_JIRA == "" ]]
207-
[[ $GLOBAL_FOOTER == "- plop\n- plop\n" ]]
207+
[[ $GLOBAL_FOOTER == "- plop"$'\n'"- plop"$'\n' ]]
208208
}
209209

210210
@test "structure: valid commit message with header, multiline body, jira and broken" {
@@ -224,9 +224,9 @@ BROKEN:
224224

225225
validate_overall_structure "$COMMIT"
226226
[[ $GLOBAL_HEADER == "plop plop" ]]
227-
[[ $GLOBAL_BODY == "hello\nplopplop\nplopplop\ntoto\n" ]]
227+
[[ $GLOBAL_BODY == "hello"$'\n'"plopplop"$'\n'"plopplop"$'\n'"toto"$'\n' ]]
228228
[[ $GLOBAL_JIRA == "ABC-1234" ]]
229-
[[ $GLOBAL_FOOTER == "- plop\n- plop\n" ]]
229+
[[ $GLOBAL_FOOTER == "- plop"$'\n'"- plop"$'\n' ]]
230230
}
231231

232232
@test "header overall should not allow 'type'" {
@@ -382,6 +382,7 @@ LUM-2345'
382382
run validate_body_length "$MESSAGE"
383383
[[ "$status" -eq $ERROR_BODY_LENGTH ]]
384384
}
385+
385386
@test "body with 100 line length should be valid" {
386387
MESSAGE='
387388
1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
@@ -515,7 +516,8 @@ Commit about stuff\"plop \"
515516
516517
Commit about stuff\"plop \" dezd
517518
518-
plop
519+
12345678901234567890123456789012345678901234567890
520+
12345678901234567890123456789012345678901234567890
519521
520522
LUM-2345
521523
BROKEN:

validator.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ validate_overall_structure() {
6363
GLOBAL_JIRA=${BASH_REMATCH[0]}
6464
else
6565
STATE="$READING_BODY"
66-
GLOBAL_BODY="${GLOBAL_BODY}${LINE}\n"
66+
GLOBAL_BODY=$GLOBAL_BODY$LINE$'\n'
6767
fi
6868

6969
elif [[ $STATE -eq $READING_BODY ]]; then
@@ -80,7 +80,7 @@ validate_overall_structure() {
8080
if [[ $LINE = "" ]]; then
8181
STATE=$START_TEXT
8282
else
83-
GLOBAL_BODY="${GLOBAL_BODY}${LINE}\n"
83+
GLOBAL_BODY=$GLOBAL_BODY$LINE$'\n'
8484
fi
8585

8686
elif [[ $STATE -eq $READING_BROKEN ]]; then
@@ -97,7 +97,7 @@ validate_overall_structure() {
9797
exit $ERROR_STRUCTURE
9898
fi
9999

100-
GLOBAL_FOOTER="${GLOBAL_FOOTER}${LINE}\n"
100+
GLOBAL_FOOTER=$GLOBAL_FOOTER$LINE$'\n'
101101

102102
else
103103
echo -e "unknown state in parsing machine"

0 commit comments

Comments
 (0)