Added tests for the functionality of updating by branch

Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com>

Author: jakub-nt

tests/shell/045_update_from_url_branch_uptodate.sh

@@ -0,0 +1,17 @@
+set -e
+set -x
+cd tests/
+mkdir -p ./tmp/
+cd ./tmp/
+touch cfbs.json && rm cfbs.json
+rm -rf .git
+
+cfbs --non-interactive init --masterfiles no
+cfbs --non-interactive add https://github.com/cfengine/test-cfbs-static-repo/@update-test-branch test-library-parsed-local-users
+
+# check that cfbs.json contains the right commit hash (ideally for testing, different than the default branch's commit hash):
+grep '"commit": "2152eb5a39fbf9b051105b400639b436bd53ab87"' cfbs.json
+# check that branch key is correctly set:
+grep '"branch": "update-test-branch"' cfbs.json
+
+cfbs update test-library-parsed-local-users | grep "Module 'test-library-parsed-local-users' already up to date"

tests/shell/046_update_from_url_branch.sh

@@ -0,0 +1,16 @@
+set -e
+set -x
+cd tests/
+mkdir -p ./tmp/
+cd ./tmp/
+touch cfbs.json && rm cfbs.json
+rm -rf .git
+
+cfbs --non-interactive init --masterfiles no
+cfbs --non-interactive add https://github.com/cfengine/test-cfbs-static-repo/@update-test-branch test-library-parsed-local-users
+
+cp ../shell/046_update_from_url_branch/cfbs.json .
+
+cfbs update test-library-parsed-local-users | grep "Updated module 'test-library-parsed-local-users' from url"
+# check that the commit hash changed:
+grep '"commit": "2152eb5a39fbf9b051105b400639b436bd53ab87"' cfbs.json

tests/shell/046_update_from_url_branch/cfbs.json

@@ -0,0 +1,21 @@
+{
+  "name": "Example project",
+  "description": "Example description",
+  "type": "policy-set",
+  "git": true,
+  "build": [
+    {
+      "name": "test-library-parsed-local-users",
+      "description": "Parse local users from /etc/passwd on the system with their attributes from /etc/shadow",
+      "url": "https://github.com/cfengine/test-cfbs-static-repo/",
+      "commit": "f702461f319e170db05bcb61f867b440b5cbd013",
+      "branch": "update-test-branch",
+      "subdirectory": "test_library_parsed_etc_passwd_shadow",
+      "added_by": "cfbs add",
+      "steps": [
+        "copy ./test_library_parsed_etc_passwd_shadow.cf services/local-users/test_library_parsed_etc_passwd_shadow/",
+        "json cfbs/def.json def.json"
+      ]
+    }
+  ]
+}

tests/shell/all.sh

@@ -48,5 +48,7 @@ bash tests/shell/041_add_multidep.sh
 bash tests/shell/042_update_from_url.sh
 bash tests/shell/043_replace_version.sh
 bash tests/shell/044_replace.sh
+bash tests/shell/045_update_from_url_branch_uptodate.sh
+bash tests/shell/046_update_from_url_branch.sh
 
 echo "All cfbs shell tests completed successfully!"