From d12e71ef9fbd2174ae66aa02ef1ded44871174ce Mon Sep 17 00:00:00 2001
From: Shubham Shinde <shubham.shinde@perforce.com>
Date: Tue, 27 Aug 2024 23:50:11 +0530
Subject: [PATCH] (VANAGON-257) Enable windowsfips-2016 to use '-fips' candle
 and heat flags

 - Fix some rubocop complaints.
 - Some cops were moved to separate gem and renamed. Require these gems and update the names.
 - Remove unused rails cops.
---
 .rubocop.yml                    | 47 +++------------------------------
 CHANGELOG.md                    |  1 +
 lib/vanagon/platform/windows.rb |  4 +--
 3 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 5180d598..8fc14c5e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,21 +13,6 @@ AllCops:
   - examples/**/*
   - lib/vanagon/platform/defaults/*
 
-Capybara/MatchStyle:
-  Enabled: true
-
-Capybara/NegationMatcher:
-  Enabled: true
-
-Capybara/SpecificActions:
-  Enabled: true
-
-Capybara/SpecificFinders:
-  Enabled: true
-
-Capybara/SpecificMatcher:
-  Enabled: true
-
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 
@@ -395,15 +380,6 @@ RSpec/DuplicatedMetadata:
 RSpec/ExcessiveDocstringSpacing:
   Enabled: true
 
-RSpec/FactoryBot/ConsistentParenthesesStyle:
-  Enabled: true
-
-RSpec/FactoryBot/FactoryNameStyle:
-  Enabled: true
-
-RSpec/FactoryBot/SyntaxMethods:
-  Enabled: true
-
 RSpec/IdenticalEqualityAssertion:
   Enabled: true
 
@@ -416,21 +392,6 @@ RSpec/NoExpectationExample:
 RSpec/PendingWithoutReason:
   Enabled: true
 
-RSpec/Rails/AvoidSetupHook:
-  Enabled: true
-
-RSpec/Rails/HaveHttpStatus:
-  Enabled: true
-
-RSpec/Rails/InferredSpecType:
-  Enabled: true
-
-RSpec/Rails/MinitestAssertions:
-  Enabled: true
-
-RSpec/Rails/TravelAround:
-  Enabled: true
-
 RSpec/RedundantAround:
   Enabled: true
 
@@ -446,16 +407,16 @@ RSpec/SubjectDeclaration:
 RSpec/VerifiedDoubleReference:
   Enabled: true
 
-Rspec/BeforeAfterAll:
+RSpec/BeforeAfterAll:
   Enabled: false
 
-Rspec/ExampleLength:
+RSpec/ExampleLength:
   Enabled: false
 
-Rspec/HookArgument:
+RSpec/HookArgument:
   Enabled: false
 
-Rspec/MultipleMemoizedHelpers:
+RSpec/MultipleMemoizedHelpers:
   Enabled: false
 
 Security/CompoundHash:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cfeafe5..ea12a413 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org).
 This changelog adheres to [Keep a CHANGELOG](https://keepachangelog.com).
 
 ## [Unreleased]
+- (VANAGON-257) Enable windowsfips-2016 to use '-fips' candle and heat flags.
 
 ## [0.52.0] - 2024-06-03
 ### Added
diff --git a/lib/vanagon/platform/windows.rb b/lib/vanagon/platform/windows.rb
index 66699c94..29bc2cb1 100644
--- a/lib/vanagon/platform/windows.rb
+++ b/lib/vanagon/platform/windows.rb
@@ -192,14 +192,14 @@ def generate_msi_package(project) # rubocop:disable Metrics/AbcSize
         #   -dr             - Root DirectoryRef to point all components to
         #   -var            - Replace "SourceDir" in the @source attributes of all components with a preprocessor variable
         app_heat_flags = " -dr INSTALLDIR -v -ke -indent 2 -cg AppComponentGroup -gg -srd -t wix/filter.xslt -sreg -var var.AppSourcePath "
-        app_heat_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
+        app_heat_flags += " -fips" if project.platform.is_windows? && project.platform.is_fips?
 
         app_source_path = "SourceDir/#{project.settings[:base_dir]}/#{project.settings[:company_id]}/#{project.settings[:product_id]}"
         # Candle.exe preprocessor vars are required due to the above double run of heat.exe, both runs of heat use
         # preprocessor variables
         candle_preprocessor = "-dAppSourcePath=\"#{app_source_path}\" "
         candle_flags = "-arch #{@architecture} #{wix_extensions}"
-        candle_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
+        candle_flags += " -fips" if project.platform.is_windows? && project.platform.is_fips?
 
         # Enable verbose mode for the moment (will be removed for production)
         # localisation flags to be added