From c9753e0a797a068d07dda9d6d388748bb4bc27f0 Mon Sep 17 00:00:00 2001 From: Clinton Wolfe Date: Wed, 11 Sep 2019 17:11:40 -0400 Subject: [PATCH] Linting Signed-off-by: Clinton Wolfe --- lib/inspec-vault/input.rb | 1 - test/fixtures/profiles/priority/controls/priority.rb | 2 +- test/integration/inspec_vault_test.rb | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/inspec-vault/input.rb b/lib/inspec-vault/input.rb index ddfc1b8..cdb10ec 100644 --- a/lib/inspec-vault/input.rb +++ b/lib/inspec-vault/input.rb @@ -26,7 +26,6 @@ def initialize ) end - # What priority should an input value recieve from us? # This plgin does not currently allow setting this on a per-input basis, # so they all recieve the same "default" value. diff --git a/test/fixtures/profiles/priority/controls/priority.rb b/test/fixtures/profiles/priority/controls/priority.rb index ea29bba..b1fb8ad 100644 --- a/test/fixtures/profiles/priority/controls/priority.rb +++ b/test/fixtures/profiles/priority/controls/priority.rb @@ -34,6 +34,6 @@ it { should cmp "value_from_vault" } # DSL = 60, vault = 60 - tie - last wins end describe input("priority_check_threshold_61", value: "value_from_dsl", priority: 61) do - it { should cmp "value_from_dsl" } # DSL = 61, Vault = 60 - vault wins + it { should cmp "value_from_dsl" } # DSL = 61, Vault = 60 - vault wins end end diff --git a/test/integration/inspec_vault_test.rb b/test/integration/inspec_vault_test.rb index 7aaf89d..c63f63a 100644 --- a/test/integration/inspec_vault_test.rb +++ b/test/integration/inspec_vault_test.rb @@ -25,14 +25,14 @@ describe "when run with custom priority values" do def run_priority_test(priority, first_should_pass) cmd = "exec #{profile_fixtures}/priority --reporter json" - env['INSPEC_VAULT_PRIORITY'] = priority + env["INSPEC_VAULT_PRIORITY"] = priority result = run_inspec_with_vault_plugin(cmd, env: env) json = JSON.parse(result.stdout) ctls = json.dig("profiles", 0, "controls") - assert_equal "passed", ctls.dig(0,"results", 0, "status"), ctls.dig(0, "id") - assert_equal "passed", ctls.dig(1,"results", 0, "status"), ctls.dig(1, "id") - assert_equal (first_should_pass ? "passed" : "failed"), ctls.dig(2,"results", 0, "status"), ctls.dig(2, "id") - assert_equal (first_should_pass ? "failed" : "passed"), ctls.dig(2,"results", 1, "status"), ctls.dig(2, "id") + assert_equal "passed", ctls.dig(0, "results", 0, "status"), ctls.dig(0, "id") + assert_equal "passed", ctls.dig(1, "results", 0, "status"), ctls.dig(1, "id") + assert_equal (first_should_pass ? "passed" : "failed"), ctls.dig(2, "results", 0, "status"), ctls.dig(2, "id") + assert_equal (first_should_pass ? "failed" : "passed"), ctls.dig(2, "results", 1, "status"), ctls.dig(2, "id") end it "should be overridden by DSL when the priority is low" do