9 files changed, 87 insertions, 4 deletions
diff --git a/tests/fixtures/0222-complete.installfile b/tests/fixtures/0222-complete.installfile
index c82063f..0c54cbf 100644
--- a/tests/fixtures/0222-complete.installfile
+++ b/tests/fixtures/0222-complete.installfile
@@ -9,6 +9,7 @@ disklabel /dev/sda gpt
 partition /dev/sda 1 fill
 fs /dev/sda1 ext4
 mount /dev/sda1 /
+version current
 repository https://distfiles.adelielinux.org/adelie/current/system
 repository https://distfiles.adelielinux.org/adelie/current/user
 signingkey /etc/apk/keys/packages@adelielinux.org.pub
diff --git a/tests/fixtures/0246-hostname-nonalnum.installfile b/tests/fixtures/0246-hostname-nonalnum.installfile
new file mode 100644
index 0000000..49d9240
--- /dev/null
+++ b/tests/fixtures/0246-hostname-nonalnum.installfile
@@ -0,0 +1,5 @@
+network true
+hostname -invalid-.foo.bar
+pkginstall adelie-base
+rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
+mount /dev/sda1 /
diff --git a/tests/fixtures/0247-version-basic.installfile b/tests/fixtures/0247-version-basic.installfile
new file mode 100644
index 0000000..67c310f
--- /dev/null
+++ b/tests/fixtures/0247-version-basic.installfile
@@ -0,0 +1,6 @@
+network false
+hostname 123lonelycorgi.street
+pkginstall adelie-base
+rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
+mount /dev/sda1 /
+version 1.0
diff --git a/tests/fixtures/0248-version-invalid.installfile b/tests/fixtures/0248-version-invalid.installfile
new file mode 100644
index 0000000..3f733cd
--- /dev/null
+++ b/tests/fixtures/0248-version-invalid.installfile
@@ -0,0 +1,6 @@
+network false
+hostname 123lonelycorgi.street
+pkginstall adelie-base
+rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
+mount /dev/sda1 /
+version !invalid
diff --git a/tests/fixtures/0249-bootloader-ppc.installfile b/tests/fixtures/0249-bootloader-ppc.installfile
new file mode 100644
index 0000000..3124cda
--- /dev/null
+++ b/tests/fixtures/0249-bootloader-ppc.installfile
@@ -0,0 +1,7 @@
+network false
+hostname test.machine
+pkginstall adelie-base
+rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
+mount /dev/sda1 /
+arch ppc
+bootloader yaboot
diff --git a/tests/fixtures/0250-bootloader-x86efi.installfile b/tests/fixtures/0250-bootloader-x86efi.installfile
new file mode 100644
index 0000000..bb18a9a
--- /dev/null
+++ b/tests/fixtures/0250-bootloader-x86efi.installfile
@@ -0,0 +1,7 @@
+network false
+hostname test.machine
+pkginstall adelie-base
+rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
+mount /dev/sda1 /
+arch pmmx
+bootloader grub-efi
diff --git a/tests/fixtures/0251-bootloader-x86bios.installfile b/tests/fixtures/0251-bootloader-x86bios.installfile
new file mode 100644
index 0000000..dbc461d
--- /dev/null
+++ b/tests/fixtures/0251-bootloader-x86bios.installfile
@@ -0,0 +1,7 @@
+network false
+hostname test.machine
+pkginstall adelie-base
+rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
+mount /dev/sda1 /
+arch x86_64
+bootloader grub-bios
diff --git a/tests/fixtures/0252-bootloader-alpha.installfile b/tests/fixtures/0252-bootloader-alpha.installfile
new file mode 100644
index 0000000..d522901
--- /dev/null
+++ b/tests/fixtures/0252-bootloader-alpha.installfile
@@ -0,0 +1,7 @@
+network false
+hostname test.machine
+pkginstall adelie-base
+rootpw $6$gumtLGmHwOVIRpQR$2M9PUO24hy5mofzWWf9a.YLbzOgOlUby1g0hDj.wG67E2wrrvys59fq02PPdxBdbgkLZFtjfEx6MHZwMBamwu/
+mount /dev/sda1 /
+arch alpha
+bootloader aboot
diff --git a/tests/spec/validator_spec.rb b/tests/spec/validator_spec.rb
index d2d121a..ceed3c2 100644
--- a/tests/spec/validator_spec.rb
+++ b/tests/spec/validator_spec.rb
@@ -133,11 +133,10 @@ RSpec.describe 'HorizonScript validation', :type => :aruba do
                     expect(last_command_started).to have_output(/error: .*hostname.*/)
                 end
                 # Runner.Validate.hostname.Begin.
-                it "with non-alphabetical first character" do
-                    use_fixture '0024-numeric-hostname.installfile'
+                it "with non-alphanumeric first character" do
+                    use_fixture '0246-hostname-nonalnum.installfile'
                     run_validate
-                    expect(last_command_started).to have_output(PARSER_SUCCESS)
-                    expect(last_command_started).to have_output(VALIDATOR_SUCCESS)
+                    expect(last_command_started).to have_output(/error: .*hostname.*/)
                 end
                 # Runner.Validate.hostname.Length
                 it "with >320 characters" do
@@ -689,6 +688,19 @@ RSpec.describe 'HorizonScript validation', :type => :aruba do
                     expect(last_command_started).to have_output(/error: .*signingkey.*too many/)
                 end
             end
+            context "for 'version' key" do
+                it "succeeds with a basic version string" do
+                    use_fixture '0247-version-basic.installfile'
+                    run_validate
+                    expect(last_command_started).to have_output(PARSER_SUCCESS)
+                    expect(last_command_started).to have_output(VALIDATOR_SUCCESS)
+                end
+                it "fails with an invalid version string" do
+                    use_fixture '0248-version-invalid.installfile'
+                    run_validate
+                    expect(last_command_started).to have_output(/error: .*version.*/)
+                end
+            end
             context "for 'pkginstall' key" do
                 it "warns when a package is listed twice in the same line" do
                     use_fixture '0216-pkginstall-dup-single.installfile'
@@ -1135,6 +1147,31 @@ RSpec.describe 'HorizonScript validation', :type => :aruba do
                     expect(last_command_started).to have_output(/error: .*fs.*already/)
                 end
             end
+            context "for 'bootloader' key" do
+                it "succeeds with valid values" do
+                    use_fixture '0250-bootloader-x86efi.installfile'
+                    run_validate
+                    expect(last_command_started).to have_output(PARSER_SUCCESS)
+                    expect(last_command_started).to have_output(VALIDATOR_SUCCESS)
+                    use_fixture '0251-bootloader-x86bios.installfile'
+                    run_validate
+                    expect(last_command_started).to have_output(PARSER_SUCCESS)
+                    expect(last_command_started).to have_output(VALIDATOR_SUCCESS)
+                end
+                it "fails with invalid values" do
+                    use_fixture '0240-bootloader-invalid.installfile'
+                    run_validate
+                    expect(last_command_started).to have_output(/error: .*bootloader.*/)
+                    use_fixture '0249-bootloader-ppc.installfile'
+                    run_validate
+                    expect(last_command_started).to have_output(/error: .*bootloader.*/)
+                end
+                it "fails with unprepared architectures" do
+                    use_fixture '0252-bootloader-alpha.installfile'
+                    run_validate
+                    expect(last_command_started).to have_output(/error: .*bootloader.*/)
+                end
+            end
             context "for 'keymap' key" do
                 it "succeeds with a simple value" do
                     use_fixture '0178-keymap-basic.installfile'