diff --git a/cypress/TestCases/README.md b/cypress/TestCases/README.md index f67756dba..b6dd2a77d 100644 --- a/cypress/TestCases/README.md +++ b/cypress/TestCases/README.md @@ -28,6 +28,6 @@ Here are some examples of tags for different categories: * Tags for communicationModes: @sdk, @transport ## Directory strucute: -Within the `cypress/TestCases` folder we have the following sub-folders: +Within the `cypress/TestCases/` folder we have the following sub-folders: - FireboltCertification: Contains core and manage feature files. - Sanity: Contains core and manage sanity tests. diff --git a/cypress/TestCases/FireboltCertification/Accessibility.feature b/cypress/TestCases/latest/FireboltCertification/Accessibility.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Accessibility.feature rename to cypress/TestCases/latest/FireboltCertification/Accessibility.feature diff --git a/cypress/TestCases/FireboltCertification/Account.feature b/cypress/TestCases/latest/FireboltCertification/Account.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Account.feature rename to cypress/TestCases/latest/FireboltCertification/Account.feature diff --git a/cypress/TestCases/FireboltCertification/AdditionalTestcases/ClosedCaptionsManage.feature b/cypress/TestCases/latest/FireboltCertification/AdditionalTestcases/ClosedCaptionsManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/AdditionalTestcases/ClosedCaptionsManage.feature rename to cypress/TestCases/latest/FireboltCertification/AdditionalTestcases/ClosedCaptionsManage.feature diff --git a/cypress/TestCases/FireboltCertification/AdditionalTestcases/UserGrants.feature b/cypress/TestCases/latest/FireboltCertification/AdditionalTestcases/UserGrants.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/AdditionalTestcases/UserGrants.feature rename to cypress/TestCases/latest/FireboltCertification/AdditionalTestcases/UserGrants.feature diff --git a/cypress/TestCases/FireboltCertification/Advertising.feature b/cypress/TestCases/latest/FireboltCertification/Advertising.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Advertising.feature rename to cypress/TestCases/latest/FireboltCertification/Advertising.feature diff --git a/cypress/TestCases/FireboltCertification/Authentication.feature b/cypress/TestCases/latest/FireboltCertification/Authentication.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Authentication.feature rename to cypress/TestCases/latest/FireboltCertification/Authentication.feature diff --git a/cypress/TestCases/FireboltCertification/Capabilities.feature b/cypress/TestCases/latest/FireboltCertification/Capabilities.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Capabilities.feature rename to cypress/TestCases/latest/FireboltCertification/Capabilities.feature diff --git a/cypress/TestCases/FireboltCertification/Device.feature b/cypress/TestCases/latest/FireboltCertification/Device.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Device.feature rename to cypress/TestCases/latest/FireboltCertification/Device.feature diff --git a/cypress/TestCases/FireboltCertification/Discovery.feature b/cypress/TestCases/latest/FireboltCertification/Discovery.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Discovery.feature rename to cypress/TestCases/latest/FireboltCertification/Discovery.feature diff --git a/cypress/TestCases/FireboltCertification/DiscoveryLaunchCold.feature b/cypress/TestCases/latest/FireboltCertification/DiscoveryLaunchCold.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/DiscoveryLaunchCold.feature rename to cypress/TestCases/latest/FireboltCertification/DiscoveryLaunchCold.feature diff --git a/cypress/TestCases/FireboltCertification/DiscoveryLaunchHot.feature b/cypress/TestCases/latest/FireboltCertification/DiscoveryLaunchHot.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/DiscoveryLaunchHot.feature rename to cypress/TestCases/latest/FireboltCertification/DiscoveryLaunchHot.feature diff --git a/cypress/TestCases/FireboltCertification/Keyboard.feature b/cypress/TestCases/latest/FireboltCertification/Keyboard.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Keyboard.feature rename to cypress/TestCases/latest/FireboltCertification/Keyboard.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/Lifecycle.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/Lifecycle.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/Lifecycle.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/Lifecycle.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/Lifecycle.md b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/Lifecycle.md similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/Lifecycle.md rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/Lifecycle.md diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleBackground.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleBackground.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleBackground.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleBackground.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleConfigurations.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleConfigurations.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleConfigurations.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleConfigurations.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleForeground.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleForeground.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleForeground.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleForeground.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleInactive.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleInactive.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleInactive.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleInactive.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleInitializing.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleInitializing.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleInitializing.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleInitializing.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleSuspended.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleSuspended.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleSuspended.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleSuspended.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleTerminated.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleTerminated.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleTerminated.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleTerminated.feature diff --git a/cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleUnloading.feature b/cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleUnloading.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/LifecycleTestcases/LifecycleUnloading.feature rename to cypress/TestCases/latest/FireboltCertification/LifecycleTestcases/LifecycleUnloading.feature diff --git a/cypress/TestCases/FireboltCertification/Localization.feature b/cypress/TestCases/latest/FireboltCertification/Localization.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Localization.feature rename to cypress/TestCases/latest/FireboltCertification/Localization.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/AccountManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/AccountManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/AccountManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/AccountManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/AcknowledgeChallengeManage_RpcOnly.feature b/cypress/TestCases/latest/FireboltCertification/Manage/AcknowledgeChallengeManage_RpcOnly.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/AcknowledgeChallengeManage_RpcOnly.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/AcknowledgeChallengeManage_RpcOnly.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/AdvertisingManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/AdvertisingManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/AdvertisingManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/AdvertisingManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/AudioDescriptionsManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/AudioDescriptionsManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/AudioDescriptionsManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/AudioDescriptionsManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/ClosedCaptionsManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/ClosedCaptionsManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/ClosedCaptionsManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/ClosedCaptionsManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/DeviceManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/DeviceManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/DeviceManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/DeviceManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/DiscoveryManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/DiscoveryManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/DiscoveryManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/DiscoveryManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/HdmiInput.feature b/cypress/TestCases/latest/FireboltCertification/Manage/HdmiInput.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/HdmiInput.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/HdmiInput.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/KeyboardManage_RpcOnly.feature b/cypress/TestCases/latest/FireboltCertification/Manage/KeyboardManage_RpcOnly.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/KeyboardManage_RpcOnly.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/KeyboardManage_RpcOnly.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/LocalizationManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/LocalizationManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/LocalizationManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/LocalizationManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/MetricsManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/MetricsManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/MetricsManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/MetricsManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/PrivacyManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/PrivacyManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/PrivacyManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/PrivacyManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/ProfileManage_RpcOnly.feature b/cypress/TestCases/latest/FireboltCertification/Manage/ProfileManage_RpcOnly.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/ProfileManage_RpcOnly.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/ProfileManage_RpcOnly.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/SecureStorageManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/SecureStorageManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/SecureStorageManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/SecureStorageManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/UserGrantsManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/UserGrantsManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/UserGrantsManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/UserGrantsManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/VoiceGuidanceManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/VoiceGuidanceManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/VoiceGuidanceManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/VoiceGuidanceManage.feature diff --git a/cypress/TestCases/FireboltCertification/Manage/WifiManage.feature b/cypress/TestCases/latest/FireboltCertification/Manage/WifiManage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Manage/WifiManage.feature rename to cypress/TestCases/latest/FireboltCertification/Manage/WifiManage.feature diff --git a/cypress/TestCases/FireboltCertification/Metrics.feature b/cypress/TestCases/latest/FireboltCertification/Metrics.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Metrics.feature rename to cypress/TestCases/latest/FireboltCertification/Metrics.feature diff --git a/cypress/TestCases/FireboltCertification/Metrics_RpcOnly.feature b/cypress/TestCases/latest/FireboltCertification/Metrics_RpcOnly.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Metrics_RpcOnly.feature rename to cypress/TestCases/latest/FireboltCertification/Metrics_RpcOnly.feature diff --git a/cypress/TestCases/FireboltCertification/Parameters.feature b/cypress/TestCases/latest/FireboltCertification/Parameters.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Parameters.feature rename to cypress/TestCases/latest/FireboltCertification/Parameters.feature diff --git a/cypress/TestCases/FireboltCertification/PreRequisite/SetDefaultValues.feature b/cypress/TestCases/latest/FireboltCertification/PreRequisite/SetDefaultValues.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/PreRequisite/SetDefaultValues.feature rename to cypress/TestCases/latest/FireboltCertification/PreRequisite/SetDefaultValues.feature diff --git a/cypress/TestCases/FireboltCertification/PreRequisite/SetDefaultValues.md b/cypress/TestCases/latest/FireboltCertification/PreRequisite/SetDefaultValues.md similarity index 100% rename from cypress/TestCases/FireboltCertification/PreRequisite/SetDefaultValues.md rename to cypress/TestCases/latest/FireboltCertification/PreRequisite/SetDefaultValues.md diff --git a/cypress/TestCases/FireboltCertification/PreRequisite/SetupCheck.feature b/cypress/TestCases/latest/FireboltCertification/PreRequisite/SetupCheck.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/PreRequisite/SetupCheck.feature rename to cypress/TestCases/latest/FireboltCertification/PreRequisite/SetupCheck.feature diff --git a/cypress/TestCases/FireboltCertification/Profile.feature b/cypress/TestCases/latest/FireboltCertification/Profile.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/Profile.feature rename to cypress/TestCases/latest/FireboltCertification/Profile.feature diff --git a/cypress/TestCases/FireboltCertification/SDKBehavior/AdvertisingSDK.feature b/cypress/TestCases/latest/FireboltCertification/SDKBehavior/AdvertisingSDK.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SDKBehavior/AdvertisingSDK.feature rename to cypress/TestCases/latest/FireboltCertification/SDKBehavior/AdvertisingSDK.feature diff --git a/cypress/TestCases/FireboltCertification/SDKBehavior/ClosedCaptionsSDK.feature b/cypress/TestCases/latest/FireboltCertification/SDKBehavior/ClosedCaptionsSDK.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SDKBehavior/ClosedCaptionsSDK.feature rename to cypress/TestCases/latest/FireboltCertification/SDKBehavior/ClosedCaptionsSDK.feature diff --git a/cypress/TestCases/FireboltCertification/SDKBehavior/DeviceSDK.feature b/cypress/TestCases/latest/FireboltCertification/SDKBehavior/DeviceSDK.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SDKBehavior/DeviceSDK.feature rename to cypress/TestCases/latest/FireboltCertification/SDKBehavior/DeviceSDK.feature diff --git a/cypress/TestCases/FireboltCertification/SDKBehavior/LocalizationSDK.feature b/cypress/TestCases/latest/FireboltCertification/SDKBehavior/LocalizationSDK.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SDKBehavior/LocalizationSDK.feature rename to cypress/TestCases/latest/FireboltCertification/SDKBehavior/LocalizationSDK.feature diff --git a/cypress/TestCases/FireboltCertification/SDKBehavior/PrivacySDK.feature b/cypress/TestCases/latest/FireboltCertification/SDKBehavior/PrivacySDK.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SDKBehavior/PrivacySDK.feature rename to cypress/TestCases/latest/FireboltCertification/SDKBehavior/PrivacySDK.feature diff --git a/cypress/TestCases/FireboltCertification/SDKBehavior/VoiceGuidanceSDK.feature b/cypress/TestCases/latest/FireboltCertification/SDKBehavior/VoiceGuidanceSDK.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SDKBehavior/VoiceGuidanceSDK.feature rename to cypress/TestCases/latest/FireboltCertification/SDKBehavior/VoiceGuidanceSDK.feature diff --git a/cypress/TestCases/FireboltCertification/SecondScreen.feature b/cypress/TestCases/latest/FireboltCertification/SecondScreen.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SecondScreen.feature rename to cypress/TestCases/latest/FireboltCertification/SecondScreen.feature diff --git a/cypress/TestCases/FireboltCertification/SecureStorage.feature b/cypress/TestCases/latest/FireboltCertification/SecureStorage.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/SecureStorage.feature rename to cypress/TestCases/latest/FireboltCertification/SecureStorage.feature diff --git a/cypress/TestCases/FireboltCertification/UserGrants.feature b/cypress/TestCases/latest/FireboltCertification/UserGrants.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/UserGrants.feature rename to cypress/TestCases/latest/FireboltCertification/UserGrants.feature diff --git a/cypress/TestCases/FireboltCertification/UserGrants.md b/cypress/TestCases/latest/FireboltCertification/UserGrants.md similarity index 100% rename from cypress/TestCases/FireboltCertification/UserGrants.md rename to cypress/TestCases/latest/FireboltCertification/UserGrants.md diff --git a/cypress/TestCases/FireboltCertification/UserInterest.feature b/cypress/TestCases/latest/FireboltCertification/UserInterest.feature similarity index 100% rename from cypress/TestCases/FireboltCertification/UserInterest.feature rename to cypress/TestCases/latest/FireboltCertification/UserInterest.feature diff --git a/cypress/TestCases/Sample/Hello.feature b/cypress/TestCases/latest/Sample/Hello.feature similarity index 100% rename from cypress/TestCases/Sample/Hello.feature rename to cypress/TestCases/latest/Sample/Hello.feature diff --git a/cypress/TestCases/Sample/Sample.feature b/cypress/TestCases/latest/Sample/Sample.feature similarity index 100% rename from cypress/TestCases/Sample/Sample.feature rename to cypress/TestCases/latest/Sample/Sample.feature diff --git a/cypress/TestCases/Sanity/CoreSDKSuite.feature b/cypress/TestCases/latest/Sanity/CoreSDKSuite.feature similarity index 100% rename from cypress/TestCases/Sanity/CoreSDKSuite.feature rename to cypress/TestCases/latest/Sanity/CoreSDKSuite.feature diff --git a/cypress/TestCases/Sanity/DiscoverySDKSuite.feature b/cypress/TestCases/latest/Sanity/DiscoverySDKSuite.feature similarity index 100% rename from cypress/TestCases/Sanity/DiscoverySDKSuite.feature rename to cypress/TestCases/latest/Sanity/DiscoverySDKSuite.feature diff --git a/cypress/TestCases/Sanity/ManageSDKSuite.feature b/cypress/TestCases/latest/Sanity/ManageSDKSuite.feature similarity index 100% rename from cypress/TestCases/Sanity/ManageSDKSuite.feature rename to cypress/TestCases/latest/Sanity/ManageSDKSuite.feature diff --git a/cypress/fixtures/docs/validations.md b/cypress/fixtures/docs/validations.md index a7fff32f8..8660215ff 100644 --- a/cypress/fixtures/docs/validations.md +++ b/cypress/fixtures/docs/validations.md @@ -519,7 +519,7 @@ The basic structure of the validation object in configModule with override will } ``` -While validating, if a key is present in both fcs-validation jsons (eg: cypress/fixtures/objects/validationObjects/accessibility.json ) and also in configModule's validation jsons (eg: in config module : fixtures/objects/validationObjects/account.json ) which will be in cypress/fixtures/external/objects/validationObjects/, it will be checking for the "override" value first. If the override value of config validation object is matching with fcs validation objects data's index value, then that specific object in the data array will be overriden with the object from configModule. Else, the configModule object will be pushed as a new object in the data array. +While validating, if a key is present in both fcs-validation jsons (eg: cypress/fixtures/objects/validationObjects/accessibility.json ) and also in configModule's validation jsons (eg: in config module : fixtures/objects/validationObjects/account.json ) which will be in cypress/fixtures/external/objects/validationObjects/, it will be checking for the "override" value first. If the override value of config validation object is matching with fcs validation objects data's index value, then that specific object in the data array will be overriden with the object from configModule. Else, the configModule object will be pushed as a new object in the data array. ### Example: diff --git a/cypress/fixtures/PreRequisiteData.json b/cypress/fixtures/latest/PreRequisiteData.json similarity index 100% rename from cypress/fixtures/PreRequisiteData.json rename to cypress/fixtures/latest/PreRequisiteData.json diff --git a/cypress/fixtures/apiObjectContext.json b/cypress/fixtures/latest/apiObjectContext.json similarity index 100% rename from cypress/fixtures/apiObjectContext.json rename to cypress/fixtures/latest/apiObjectContext.json diff --git a/cypress/fixtures/censorData.json b/cypress/fixtures/latest/censorData.json similarity index 100% rename from cypress/fixtures/censorData.json rename to cypress/fixtures/latest/censorData.json diff --git a/cypress/fixtures/customReportData.json b/cypress/fixtures/latest/customReportData.json similarity index 100% rename from cypress/fixtures/customReportData.json rename to cypress/fixtures/latest/customReportData.json diff --git a/cypress/fixtures/customReportData.md b/cypress/fixtures/latest/customReportData.md similarity index 87% rename from cypress/fixtures/customReportData.md rename to cypress/fixtures/latest/customReportData.md index a37297fa6..956d32b2e 100644 --- a/cypress/fixtures/customReportData.md +++ b/cypress/fixtures/latest/customReportData.md @@ -2,7 +2,7 @@ We use a JSON structure to define `customFooter` and `customMetadata` for various pages within the report. This allows dynamic customization, ensuring that each page can have specific information and design elements as needed. ## Loading the JSON Data -The JSON data will first be loaded from `configModule/fixtures/external/objects/customReportData.json`. If this file is not available in the configModule, the data will be loaded from the local JSON file located at `cypress/fixtures/customReportData.json`. +The JSON data will first be loaded from `configModule/fixtures/external//objects/customReportData.json`. If this file is not available in the configModule, the data will be loaded from the local JSON file located at `cypress/fixtures/customReportData.json`. ## Fields `customFooter` diff --git a/cypress/fixtures/decodeValue.json b/cypress/fixtures/latest/decodeValue.json similarity index 100% rename from cypress/fixtures/decodeValue.json rename to cypress/fixtures/latest/decodeValue.json diff --git a/cypress/fixtures/defaultDeviceData.json b/cypress/fixtures/latest/defaultDeviceData.json similarity index 100% rename from cypress/fixtures/defaultDeviceData.json rename to cypress/fixtures/latest/defaultDeviceData.json diff --git a/cypress/fixtures/defaultTestData.json b/cypress/fixtures/latest/defaultTestData.json similarity index 100% rename from cypress/fixtures/defaultTestData.json rename to cypress/fixtures/latest/defaultTestData.json diff --git a/cypress/fixtures/fireboltCalls/accessibility.js b/cypress/fixtures/latest/fireboltCalls/accessibility.js similarity index 100% rename from cypress/fixtures/fireboltCalls/accessibility.js rename to cypress/fixtures/latest/fireboltCalls/accessibility.js diff --git a/cypress/fixtures/fireboltCalls/accessibility.json b/cypress/fixtures/latest/fireboltCalls/accessibility.json similarity index 100% rename from cypress/fixtures/fireboltCalls/accessibility.json rename to cypress/fixtures/latest/fireboltCalls/accessibility.json diff --git a/cypress/fixtures/fireboltCalls/account.js b/cypress/fixtures/latest/fireboltCalls/account.js similarity index 100% rename from cypress/fixtures/fireboltCalls/account.js rename to cypress/fixtures/latest/fireboltCalls/account.js diff --git a/cypress/fixtures/fireboltCalls/account.json b/cypress/fixtures/latest/fireboltCalls/account.json similarity index 100% rename from cypress/fixtures/fireboltCalls/account.json rename to cypress/fixtures/latest/fireboltCalls/account.json diff --git a/cypress/fixtures/fireboltCalls/advertising.js b/cypress/fixtures/latest/fireboltCalls/advertising.js similarity index 100% rename from cypress/fixtures/fireboltCalls/advertising.js rename to cypress/fixtures/latest/fireboltCalls/advertising.js diff --git a/cypress/fixtures/fireboltCalls/advertising.json b/cypress/fixtures/latest/fireboltCalls/advertising.json similarity index 100% rename from cypress/fixtures/fireboltCalls/advertising.json rename to cypress/fixtures/latest/fireboltCalls/advertising.json diff --git a/cypress/fixtures/fireboltCalls/audiodescriptions.js b/cypress/fixtures/latest/fireboltCalls/audiodescriptions.js similarity index 100% rename from cypress/fixtures/fireboltCalls/audiodescriptions.js rename to cypress/fixtures/latest/fireboltCalls/audiodescriptions.js diff --git a/cypress/fixtures/fireboltCalls/audiodescriptions.json b/cypress/fixtures/latest/fireboltCalls/audiodescriptions.json similarity index 100% rename from cypress/fixtures/fireboltCalls/audiodescriptions.json rename to cypress/fixtures/latest/fireboltCalls/audiodescriptions.json diff --git a/cypress/fixtures/fireboltCalls/authentication.js b/cypress/fixtures/latest/fireboltCalls/authentication.js similarity index 100% rename from cypress/fixtures/fireboltCalls/authentication.js rename to cypress/fixtures/latest/fireboltCalls/authentication.js diff --git a/cypress/fixtures/fireboltCalls/authentication.json b/cypress/fixtures/latest/fireboltCalls/authentication.json similarity index 100% rename from cypress/fixtures/fireboltCalls/authentication.json rename to cypress/fixtures/latest/fireboltCalls/authentication.json diff --git a/cypress/fixtures/fireboltCalls/capabilities.js b/cypress/fixtures/latest/fireboltCalls/capabilities.js similarity index 100% rename from cypress/fixtures/fireboltCalls/capabilities.js rename to cypress/fixtures/latest/fireboltCalls/capabilities.js diff --git a/cypress/fixtures/fireboltCalls/capabilities.json b/cypress/fixtures/latest/fireboltCalls/capabilities.json similarity index 100% rename from cypress/fixtures/fireboltCalls/capabilities.json rename to cypress/fixtures/latest/fireboltCalls/capabilities.json diff --git a/cypress/fixtures/fireboltCalls/closedcaptions.js b/cypress/fixtures/latest/fireboltCalls/closedcaptions.js similarity index 100% rename from cypress/fixtures/fireboltCalls/closedcaptions.js rename to cypress/fixtures/latest/fireboltCalls/closedcaptions.js diff --git a/cypress/fixtures/fireboltCalls/closedcaptions.json b/cypress/fixtures/latest/fireboltCalls/closedcaptions.json similarity index 100% rename from cypress/fixtures/fireboltCalls/closedcaptions.json rename to cypress/fixtures/latest/fireboltCalls/closedcaptions.json diff --git a/cypress/fixtures/fireboltCalls/content.json b/cypress/fixtures/latest/fireboltCalls/content.json similarity index 100% rename from cypress/fixtures/fireboltCalls/content.json rename to cypress/fixtures/latest/fireboltCalls/content.json diff --git a/cypress/fixtures/fireboltCalls/device.js b/cypress/fixtures/latest/fireboltCalls/device.js similarity index 100% rename from cypress/fixtures/fireboltCalls/device.js rename to cypress/fixtures/latest/fireboltCalls/device.js diff --git a/cypress/fixtures/fireboltCalls/device.json b/cypress/fixtures/latest/fireboltCalls/device.json similarity index 100% rename from cypress/fixtures/fireboltCalls/device.json rename to cypress/fixtures/latest/fireboltCalls/device.json diff --git a/cypress/fixtures/fireboltCalls/discovery.js b/cypress/fixtures/latest/fireboltCalls/discovery.js similarity index 100% rename from cypress/fixtures/fireboltCalls/discovery.js rename to cypress/fixtures/latest/fireboltCalls/discovery.js diff --git a/cypress/fixtures/fireboltCalls/discovery.json b/cypress/fixtures/latest/fireboltCalls/discovery.json similarity index 100% rename from cypress/fixtures/fireboltCalls/discovery.json rename to cypress/fixtures/latest/fireboltCalls/discovery.json diff --git a/cypress/fixtures/fireboltCalls/discoverylaunch.json b/cypress/fixtures/latest/fireboltCalls/discoverylaunch.json similarity index 100% rename from cypress/fixtures/fireboltCalls/discoverylaunch.json rename to cypress/fixtures/latest/fireboltCalls/discoverylaunch.json diff --git a/cypress/fixtures/fireboltCalls/dynamicVariables.js b/cypress/fixtures/latest/fireboltCalls/dynamicVariables.js similarity index 100% rename from cypress/fixtures/fireboltCalls/dynamicVariables.js rename to cypress/fixtures/latest/fireboltCalls/dynamicVariables.js diff --git a/cypress/fixtures/fireboltCalls/hdmiinput.js b/cypress/fixtures/latest/fireboltCalls/hdmiinput.js similarity index 100% rename from cypress/fixtures/fireboltCalls/hdmiinput.js rename to cypress/fixtures/latest/fireboltCalls/hdmiinput.js diff --git a/cypress/fixtures/fireboltCalls/hdmiinput.json b/cypress/fixtures/latest/fireboltCalls/hdmiinput.json similarity index 100% rename from cypress/fixtures/fireboltCalls/hdmiinput.json rename to cypress/fixtures/latest/fireboltCalls/hdmiinput.json diff --git a/cypress/fixtures/fireboltCalls/keyboard.json b/cypress/fixtures/latest/fireboltCalls/keyboard.json similarity index 100% rename from cypress/fixtures/fireboltCalls/keyboard.json rename to cypress/fixtures/latest/fireboltCalls/keyboard.json diff --git a/cypress/fixtures/fireboltCalls/lifecycle.json b/cypress/fixtures/latest/fireboltCalls/lifecycle.json similarity index 100% rename from cypress/fixtures/fireboltCalls/lifecycle.json rename to cypress/fixtures/latest/fireboltCalls/lifecycle.json diff --git a/cypress/fixtures/fireboltCalls/localization.js b/cypress/fixtures/latest/fireboltCalls/localization.js similarity index 100% rename from cypress/fixtures/fireboltCalls/localization.js rename to cypress/fixtures/latest/fireboltCalls/localization.js diff --git a/cypress/fixtures/fireboltCalls/localization.json b/cypress/fixtures/latest/fireboltCalls/localization.json similarity index 100% rename from cypress/fixtures/fireboltCalls/localization.json rename to cypress/fixtures/latest/fireboltCalls/localization.json diff --git a/cypress/fixtures/fireboltCalls/metrics.js b/cypress/fixtures/latest/fireboltCalls/metrics.js similarity index 100% rename from cypress/fixtures/fireboltCalls/metrics.js rename to cypress/fixtures/latest/fireboltCalls/metrics.js diff --git a/cypress/fixtures/fireboltCalls/metrics.json b/cypress/fixtures/latest/fireboltCalls/metrics.json similarity index 100% rename from cypress/fixtures/fireboltCalls/metrics.json rename to cypress/fixtures/latest/fireboltCalls/metrics.json diff --git a/cypress/fixtures/fireboltCalls/parameters.js b/cypress/fixtures/latest/fireboltCalls/parameters.js similarity index 100% rename from cypress/fixtures/fireboltCalls/parameters.js rename to cypress/fixtures/latest/fireboltCalls/parameters.js diff --git a/cypress/fixtures/fireboltCalls/parameters.json b/cypress/fixtures/latest/fireboltCalls/parameters.json similarity index 100% rename from cypress/fixtures/fireboltCalls/parameters.json rename to cypress/fixtures/latest/fireboltCalls/parameters.json diff --git a/cypress/fixtures/fireboltCalls/privacy.js b/cypress/fixtures/latest/fireboltCalls/privacy.js similarity index 100% rename from cypress/fixtures/fireboltCalls/privacy.js rename to cypress/fixtures/latest/fireboltCalls/privacy.js diff --git a/cypress/fixtures/fireboltCalls/privacy.json b/cypress/fixtures/latest/fireboltCalls/privacy.json similarity index 100% rename from cypress/fixtures/fireboltCalls/privacy.json rename to cypress/fixtures/latest/fireboltCalls/privacy.json diff --git a/cypress/fixtures/fireboltCalls/profile.json b/cypress/fixtures/latest/fireboltCalls/profile.json similarity index 100% rename from cypress/fixtures/fireboltCalls/profile.json rename to cypress/fixtures/latest/fireboltCalls/profile.json diff --git a/cypress/fixtures/fireboltCalls/sample.json b/cypress/fixtures/latest/fireboltCalls/sample.json similarity index 100% rename from cypress/fixtures/fireboltCalls/sample.json rename to cypress/fixtures/latest/fireboltCalls/sample.json diff --git a/cypress/fixtures/fireboltCalls/secondscreen.js b/cypress/fixtures/latest/fireboltCalls/secondscreen.js similarity index 100% rename from cypress/fixtures/fireboltCalls/secondscreen.js rename to cypress/fixtures/latest/fireboltCalls/secondscreen.js diff --git a/cypress/fixtures/fireboltCalls/secondscreen.json b/cypress/fixtures/latest/fireboltCalls/secondscreen.json similarity index 100% rename from cypress/fixtures/fireboltCalls/secondscreen.json rename to cypress/fixtures/latest/fireboltCalls/secondscreen.json diff --git a/cypress/fixtures/fireboltCalls/securestorage.js b/cypress/fixtures/latest/fireboltCalls/securestorage.js similarity index 100% rename from cypress/fixtures/fireboltCalls/securestorage.js rename to cypress/fixtures/latest/fireboltCalls/securestorage.js diff --git a/cypress/fixtures/fireboltCalls/securestorage.json b/cypress/fixtures/latest/fireboltCalls/securestorage.json similarity index 100% rename from cypress/fixtures/fireboltCalls/securestorage.json rename to cypress/fixtures/latest/fireboltCalls/securestorage.json diff --git a/cypress/fixtures/fireboltCalls/usergrants.json b/cypress/fixtures/latest/fireboltCalls/usergrants.json similarity index 100% rename from cypress/fixtures/fireboltCalls/usergrants.json rename to cypress/fixtures/latest/fireboltCalls/usergrants.json diff --git a/cypress/fixtures/fireboltCalls/userinterest.json b/cypress/fixtures/latest/fireboltCalls/userinterest.json similarity index 100% rename from cypress/fixtures/fireboltCalls/userinterest.json rename to cypress/fixtures/latest/fireboltCalls/userinterest.json diff --git a/cypress/fixtures/fireboltCalls/voiceguidance.js b/cypress/fixtures/latest/fireboltCalls/voiceguidance.js similarity index 100% rename from cypress/fixtures/fireboltCalls/voiceguidance.js rename to cypress/fixtures/latest/fireboltCalls/voiceguidance.js diff --git a/cypress/fixtures/fireboltCalls/voiceguidance.json b/cypress/fixtures/latest/fireboltCalls/voiceguidance.json similarity index 100% rename from cypress/fixtures/fireboltCalls/voiceguidance.json rename to cypress/fixtures/latest/fireboltCalls/voiceguidance.json diff --git a/cypress/fixtures/fireboltCalls/wifi.js b/cypress/fixtures/latest/fireboltCalls/wifi.js similarity index 100% rename from cypress/fixtures/fireboltCalls/wifi.js rename to cypress/fixtures/latest/fireboltCalls/wifi.js diff --git a/cypress/fixtures/fireboltCalls/wifi.json b/cypress/fixtures/latest/fireboltCalls/wifi.json similarity index 100% rename from cypress/fixtures/fireboltCalls/wifi.json rename to cypress/fixtures/latest/fireboltCalls/wifi.json diff --git a/cypress/fixtures/fireboltMocks/clearEventData.json b/cypress/fixtures/latest/fireboltMocks/clearEventData.json similarity index 100% rename from cypress/fixtures/fireboltMocks/clearEventData.json rename to cypress/fixtures/latest/fireboltMocks/clearEventData.json diff --git a/cypress/fixtures/grantPolicy.json b/cypress/fixtures/latest/grantPolicy.json similarity index 100% rename from cypress/fixtures/grantPolicy.json rename to cypress/fixtures/latest/grantPolicy.json diff --git a/cypress/fixtures/grantPolicyDependencies.json b/cypress/fixtures/latest/grantPolicyDependencies.json similarity index 100% rename from cypress/fixtures/grantPolicyDependencies.json rename to cypress/fixtures/latest/grantPolicyDependencies.json diff --git a/cypress/fixtures/modules/accessibility.json b/cypress/fixtures/latest/modules/accessibility.json similarity index 100% rename from cypress/fixtures/modules/accessibility.json rename to cypress/fixtures/latest/modules/accessibility.json diff --git a/cypress/fixtures/modules/account.json b/cypress/fixtures/latest/modules/account.json similarity index 100% rename from cypress/fixtures/modules/account.json rename to cypress/fixtures/latest/modules/account.json diff --git a/cypress/fixtures/modules/advertising.json b/cypress/fixtures/latest/modules/advertising.json similarity index 100% rename from cypress/fixtures/modules/advertising.json rename to cypress/fixtures/latest/modules/advertising.json diff --git a/cypress/fixtures/modules/audiodescriptions.json b/cypress/fixtures/latest/modules/audiodescriptions.json similarity index 100% rename from cypress/fixtures/modules/audiodescriptions.json rename to cypress/fixtures/latest/modules/audiodescriptions.json diff --git a/cypress/fixtures/modules/authentication.json b/cypress/fixtures/latest/modules/authentication.json similarity index 100% rename from cypress/fixtures/modules/authentication.json rename to cypress/fixtures/latest/modules/authentication.json diff --git a/cypress/fixtures/modules/capabilities.json b/cypress/fixtures/latest/modules/capabilities.json similarity index 100% rename from cypress/fixtures/modules/capabilities.json rename to cypress/fixtures/latest/modules/capabilities.json diff --git a/cypress/fixtures/modules/closedcaptions.json b/cypress/fixtures/latest/modules/closedcaptions.json similarity index 100% rename from cypress/fixtures/modules/closedcaptions.json rename to cypress/fixtures/latest/modules/closedcaptions.json diff --git a/cypress/fixtures/modules/device.json b/cypress/fixtures/latest/modules/device.json similarity index 100% rename from cypress/fixtures/modules/device.json rename to cypress/fixtures/latest/modules/device.json diff --git a/cypress/fixtures/modules/discovery.json b/cypress/fixtures/latest/modules/discovery.json similarity index 100% rename from cypress/fixtures/modules/discovery.json rename to cypress/fixtures/latest/modules/discovery.json diff --git a/cypress/fixtures/modules/hdmiinput.json b/cypress/fixtures/latest/modules/hdmiinput.json similarity index 100% rename from cypress/fixtures/modules/hdmiinput.json rename to cypress/fixtures/latest/modules/hdmiinput.json diff --git a/cypress/fixtures/modules/keyboard.json b/cypress/fixtures/latest/modules/keyboard.json similarity index 100% rename from cypress/fixtures/modules/keyboard.json rename to cypress/fixtures/latest/modules/keyboard.json diff --git a/cypress/fixtures/modules/lifecycle.json b/cypress/fixtures/latest/modules/lifecycle.json similarity index 100% rename from cypress/fixtures/modules/lifecycle.json rename to cypress/fixtures/latest/modules/lifecycle.json diff --git a/cypress/fixtures/modules/localization.json b/cypress/fixtures/latest/modules/localization.json similarity index 100% rename from cypress/fixtures/modules/localization.json rename to cypress/fixtures/latest/modules/localization.json diff --git a/cypress/fixtures/modules/metrics.json b/cypress/fixtures/latest/modules/metrics.json similarity index 100% rename from cypress/fixtures/modules/metrics.json rename to cypress/fixtures/latest/modules/metrics.json diff --git a/cypress/fixtures/modules/parameters.json b/cypress/fixtures/latest/modules/parameters.json similarity index 100% rename from cypress/fixtures/modules/parameters.json rename to cypress/fixtures/latest/modules/parameters.json diff --git a/cypress/fixtures/modules/privacy.json b/cypress/fixtures/latest/modules/privacy.json similarity index 100% rename from cypress/fixtures/modules/privacy.json rename to cypress/fixtures/latest/modules/privacy.json diff --git a/cypress/fixtures/modules/profile.json b/cypress/fixtures/latest/modules/profile.json similarity index 100% rename from cypress/fixtures/modules/profile.json rename to cypress/fixtures/latest/modules/profile.json diff --git a/cypress/fixtures/modules/secondscreen.json b/cypress/fixtures/latest/modules/secondscreen.json similarity index 100% rename from cypress/fixtures/modules/secondscreen.json rename to cypress/fixtures/latest/modules/secondscreen.json diff --git a/cypress/fixtures/modules/securestorage.json b/cypress/fixtures/latest/modules/securestorage.json similarity index 100% rename from cypress/fixtures/modules/securestorage.json rename to cypress/fixtures/latest/modules/securestorage.json diff --git a/cypress/fixtures/modules/usergrants.json b/cypress/fixtures/latest/modules/usergrants.json similarity index 100% rename from cypress/fixtures/modules/usergrants.json rename to cypress/fixtures/latest/modules/usergrants.json diff --git a/cypress/fixtures/modules/voiceguidance.json b/cypress/fixtures/latest/modules/voiceguidance.json similarity index 100% rename from cypress/fixtures/modules/voiceguidance.json rename to cypress/fixtures/latest/modules/voiceguidance.json diff --git a/cypress/fixtures/modules/wifi.json b/cypress/fixtures/latest/modules/wifi.json similarity index 100% rename from cypress/fixtures/modules/wifi.json rename to cypress/fixtures/latest/modules/wifi.json diff --git a/cypress/fixtures/objects/errorContentObjects.js b/cypress/fixtures/latest/objects/errorContentObjects.js similarity index 100% rename from cypress/fixtures/objects/errorContentObjects.js rename to cypress/fixtures/latest/objects/errorContentObjects.js diff --git a/cypress/fixtures/objects/errorContentObjects.json b/cypress/fixtures/latest/objects/errorContentObjects.json similarity index 100% rename from cypress/fixtures/objects/errorContentObjects.json rename to cypress/fixtures/latest/objects/errorContentObjects.json diff --git a/cypress/fixtures/objects/lifecycleAppObject.json b/cypress/fixtures/latest/objects/lifecycleAppObject.json similarity index 100% rename from cypress/fixtures/objects/lifecycleAppObject.json rename to cypress/fixtures/latest/objects/lifecycleAppObject.json diff --git a/cypress/fixtures/objects/moduleReqId/moduleReqId.json b/cypress/fixtures/latest/objects/moduleReqId/moduleReqId.json similarity index 100% rename from cypress/fixtures/objects/moduleReqId/moduleReqId.json rename to cypress/fixtures/latest/objects/moduleReqId/moduleReqId.json diff --git a/cypress/fixtures/objects/validationObjects/accessibility.json b/cypress/fixtures/latest/objects/validationObjects/accessibility.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/accessibility.json rename to cypress/fixtures/latest/objects/validationObjects/accessibility.json diff --git a/cypress/fixtures/objects/validationObjects/advertising.json b/cypress/fixtures/latest/objects/validationObjects/advertising.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/advertising.json rename to cypress/fixtures/latest/objects/validationObjects/advertising.json diff --git a/cypress/fixtures/objects/validationObjects/audiodescription.json b/cypress/fixtures/latest/objects/validationObjects/audiodescription.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/audiodescription.json rename to cypress/fixtures/latest/objects/validationObjects/audiodescription.json diff --git a/cypress/fixtures/objects/validationObjects/authentication.json b/cypress/fixtures/latest/objects/validationObjects/authentication.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/authentication.json rename to cypress/fixtures/latest/objects/validationObjects/authentication.json diff --git a/cypress/fixtures/objects/validationObjects/capabilities.json b/cypress/fixtures/latest/objects/validationObjects/capabilities.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/capabilities.json rename to cypress/fixtures/latest/objects/validationObjects/capabilities.json diff --git a/cypress/fixtures/objects/validationObjects/closedcaptions.json b/cypress/fixtures/latest/objects/validationObjects/closedcaptions.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/closedcaptions.json rename to cypress/fixtures/latest/objects/validationObjects/closedcaptions.json diff --git a/cypress/fixtures/objects/validationObjects/device.json b/cypress/fixtures/latest/objects/validationObjects/device.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/device.json rename to cypress/fixtures/latest/objects/validationObjects/device.json diff --git a/cypress/fixtures/objects/validationObjects/discovery.json b/cypress/fixtures/latest/objects/validationObjects/discovery.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/discovery.json rename to cypress/fixtures/latest/objects/validationObjects/discovery.json diff --git a/cypress/fixtures/objects/validationObjects/discoverylaunch.json b/cypress/fixtures/latest/objects/validationObjects/discoverylaunch.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/discoverylaunch.json rename to cypress/fixtures/latest/objects/validationObjects/discoverylaunch.json diff --git a/cypress/fixtures/objects/validationObjects/hdmiinput.json b/cypress/fixtures/latest/objects/validationObjects/hdmiinput.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/hdmiinput.json rename to cypress/fixtures/latest/objects/validationObjects/hdmiinput.json diff --git a/cypress/fixtures/objects/validationObjects/keyboard.json b/cypress/fixtures/latest/objects/validationObjects/keyboard.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/keyboard.json rename to cypress/fixtures/latest/objects/validationObjects/keyboard.json diff --git a/cypress/fixtures/objects/validationObjects/lifecycle.json b/cypress/fixtures/latest/objects/validationObjects/lifecycle.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/lifecycle.json rename to cypress/fixtures/latest/objects/validationObjects/lifecycle.json diff --git a/cypress/fixtures/objects/validationObjects/localization.json b/cypress/fixtures/latest/objects/validationObjects/localization.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/localization.json rename to cypress/fixtures/latest/objects/validationObjects/localization.json diff --git a/cypress/fixtures/objects/validationObjects/parameters.json b/cypress/fixtures/latest/objects/validationObjects/parameters.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/parameters.json rename to cypress/fixtures/latest/objects/validationObjects/parameters.json diff --git a/cypress/fixtures/objects/validationObjects/privacy.json b/cypress/fixtures/latest/objects/validationObjects/privacy.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/privacy.json rename to cypress/fixtures/latest/objects/validationObjects/privacy.json diff --git a/cypress/fixtures/objects/validationObjects/profile.json b/cypress/fixtures/latest/objects/validationObjects/profile.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/profile.json rename to cypress/fixtures/latest/objects/validationObjects/profile.json diff --git a/cypress/fixtures/objects/validationObjects/secondscreen.json b/cypress/fixtures/latest/objects/validationObjects/secondscreen.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/secondscreen.json rename to cypress/fixtures/latest/objects/validationObjects/secondscreen.json diff --git a/cypress/fixtures/objects/validationObjects/securestorage.json b/cypress/fixtures/latest/objects/validationObjects/securestorage.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/securestorage.json rename to cypress/fixtures/latest/objects/validationObjects/securestorage.json diff --git a/cypress/fixtures/objects/validationObjects/usergrants.json b/cypress/fixtures/latest/objects/validationObjects/usergrants.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/usergrants.json rename to cypress/fixtures/latest/objects/validationObjects/usergrants.json diff --git a/cypress/fixtures/objects/validationObjects/voiceguidance.json b/cypress/fixtures/latest/objects/validationObjects/voiceguidance.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/voiceguidance.json rename to cypress/fixtures/latest/objects/validationObjects/voiceguidance.json diff --git a/cypress/fixtures/objects/validationObjects/wifi.json b/cypress/fixtures/latest/objects/validationObjects/wifi.json similarity index 100% rename from cypress/fixtures/objects/validationObjects/wifi.json rename to cypress/fixtures/latest/objects/validationObjects/wifi.json diff --git a/cypress/fixtures/regexformats.js b/cypress/fixtures/latest/regexformats.js similarity index 100% rename from cypress/fixtures/regexformats.js rename to cypress/fixtures/latest/regexformats.js diff --git a/cypress/fixtures/schemas/errorSchema.json b/cypress/fixtures/latest/schemas/errorSchema.json similarity index 100% rename from cypress/fixtures/schemas/errorSchema.json rename to cypress/fixtures/latest/schemas/errorSchema.json diff --git a/cypress/fixtures/schemas/lifecycleHistorySchema.json b/cypress/fixtures/latest/schemas/lifecycleHistorySchema.json similarity index 100% rename from cypress/fixtures/schemas/lifecycleHistorySchema.json rename to cypress/fixtures/latest/schemas/lifecycleHistorySchema.json diff --git a/cypress/fixtures/setResponseData.json b/cypress/fixtures/latest/setResponseData.json similarity index 100% rename from cypress/fixtures/setResponseData.json rename to cypress/fixtures/latest/setResponseData.json diff --git a/cypress/fixtures/versions/0.11.0/firebolt.json b/cypress/fixtures/latest/versions/0.11.0/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.11.0/firebolt.json rename to cypress/fixtures/latest/versions/0.11.0/firebolt.json diff --git a/cypress/fixtures/versions/0.12.0/firebolt.json b/cypress/fixtures/latest/versions/0.12.0/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.12.0/firebolt.json rename to cypress/fixtures/latest/versions/0.12.0/firebolt.json diff --git a/cypress/fixtures/versions/0.13.0/firebolt.json b/cypress/fixtures/latest/versions/0.13.0/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.13.0/firebolt.json rename to cypress/fixtures/latest/versions/0.13.0/firebolt.json diff --git a/cypress/fixtures/versions/0.14.0/firebolt.json b/cypress/fixtures/latest/versions/0.14.0/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.14.0/firebolt.json rename to cypress/fixtures/latest/versions/0.14.0/firebolt.json diff --git a/cypress/fixtures/versions/0.15.0/firebolt.json b/cypress/fixtures/latest/versions/0.15.0/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.15.0/firebolt.json rename to cypress/fixtures/latest/versions/0.15.0/firebolt.json diff --git a/cypress/fixtures/versions/0.16.0/firebolt.json b/cypress/fixtures/latest/versions/0.16.0/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.16.0/firebolt.json rename to cypress/fixtures/latest/versions/0.16.0/firebolt.json diff --git a/cypress/fixtures/versions/0.17.0/firebolt.json b/cypress/fixtures/latest/versions/0.17.0/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.17.0/firebolt.json rename to cypress/fixtures/latest/versions/0.17.0/firebolt.json diff --git a/cypress/fixtures/versions/0.17.1/firebolt.json b/cypress/fixtures/latest/versions/0.17.1/firebolt.json similarity index 100% rename from cypress/fixtures/versions/0.17.1/firebolt.json rename to cypress/fixtures/latest/versions/0.17.1/firebolt.json diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index 7200aaa5e..e39a8f7b6 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -46,7 +46,9 @@ let metaDataArr = []; module.exports = async (on, config) => { // To set the specPattern dynamically based on the testSuite const testsuite = config.env.testSuite; - const specPattern = getSpecPattern(testsuite); + const sdkVersion = config.env.sdkVersion || 'latest'; + CONSTANTS.setSdkVersion(sdkVersion); + const specPattern = getSpecPattern(testsuite, sdkVersion); if (specPattern !== undefined) { config.specPattern = specPattern; } @@ -93,6 +95,32 @@ module.exports = async (on, config) => { logger.info(message); return null; }, + getFireboltCallsData({ sdkVersion }) { + console.log( + 'sdkversion inside index.js:------------------------->>>>>>>>>>>>>>>>>> ', + sdkVersion + ); + let data; + + const internalPath = path.resolve( + __dirname, + `../fixtures/${sdkVersion}/fireboltCalls/index.js` + ); + + try { + if (fs.existsSync(internalPath)) { + data = fs.readFileSync(internalPath, 'utf-8'); + console.log('data 2204: _______>>>>>', data); + return data; + } else { + console.log(`Internal fireboltCalls data file not found: ${internalPath}`); + } + } catch (err) { + console.error(`Error reading files:`, err); + } + + return data; + }, /* write json or string to file @param fileName - complete file name with path @param data - json or string @@ -310,9 +338,11 @@ module.exports = async (on, config) => { if (fs.existsSync(tempReportEnv)) reportProperties.reportEnv = require(tempReportEnv); let customReportData; try { - customReportData = require('../fixtures/external/objects/customReportData.json'); + customReportData = require( + `../fixtures/external/${sdkVersion}/objects/customReportData.json` + ); } catch (error) { - customReportData = require('../fixtures/customReportData.json'); + customReportData = require(`../fixtures/${sdkVersion}/customReportData.json`); } reportProperties.isCombinedTestRun = process.env.CYPRESS_isCombinedTestRun; reportProperties.customReportData = customReportData; diff --git a/cypress/plugins/localReportGenerator.js b/cypress/plugins/localReportGenerator.js index 8f1c6ab16..d007d2013 100644 --- a/cypress/plugins/localReportGenerator.js +++ b/cypress/plugins/localReportGenerator.js @@ -73,10 +73,13 @@ async function generateLocalReport(reportObj, jobId) { // Move cucumber json to a separate directory and get the path const cucumberDir = await filterCucumberJson(reportObj.cucumberReportFilePath); let customReportData; + const sdkVersion = config.env.sdkVersion || 'latest'; try { - customReportData = require('../fixtures/external/objects/customReportData.json'); + customReportData = require( + `../fixtures/external/${sdkVersion}/objects/customReportData.json` + ); } catch (error) { - customReportData = require('../fixtures/customReportData.json'); + customReportData = require(`../fixtures/${sdkVersion}/customReportData.json`); } // Configure cucumber report options reportEnv.jsonDir = cucumberDir; diff --git a/cypress/plugins/pluginUtils.js b/cypress/plugins/pluginUtils.js index bf4502fd9..81ab438df 100644 --- a/cypress/plugins/pluginUtils.js +++ b/cypress/plugins/pluginUtils.js @@ -137,7 +137,8 @@ function preprocessDeviceData(config) { logger.error('Device MAC address is required.'); } const formattedDeviceMac = deviceMac.replace(/:/g, '').toUpperCase(); - const jsonFilePath = `cypress/fixtures/external/devices/${formattedDeviceMac}.json`; + const sdkVersion = config.env.sdkVersion || 'latest'; + const jsonFilePath = `cypress/fixtures/external/${sdkVersion}/devices/${formattedDeviceMac}.json`; let deviceData; try { diff --git a/cypress/plugins/testDataProcessor.js b/cypress/plugins/testDataProcessor.js index 5a8e38efa..ebbbfef89 100644 --- a/cypress/plugins/testDataProcessor.js +++ b/cypress/plugins/testDataProcessor.js @@ -1,7 +1,7 @@ const fs = require('fs'); const jsonMerger = require('json-merger'); const CONSTANTS = require('../support/constants/constants'); -const REGEXFORMATS = require('../fixtures/regexformats'); +const REGEXFORMATS = require('../fixtures/latest/regexformats'); let envVariables; const path = require('path'); const _ = require('lodash'); diff --git a/cypress/plugins/testDataProcessor.md b/cypress/plugins/testDataProcessor.md index 9b043e3f7..1aa38b104 100644 --- a/cypress/plugins/testDataProcessor.md +++ b/cypress/plugins/testDataProcessor.md @@ -73,7 +73,7 @@ Currently supported requestType is params, context and content. * Error validation * Result validation - Static Content Validation - Required content will be fetched from combined(fcs and config module) `default json` or from the corresponding `module json` files based on the precedence. - - `module.json` files reside in `fixtures/modules/` or `fixtures/external/modules/` + - `module.json` files reside in `fixtures//modules/` or `fixtures/external//modules/` - Device Content Validation - Content will be fetched from `devicMac.json` file when devicMac is present. diff --git a/cypress/support/constants/constants.js b/cypress/support/constants/constants.js index 466b5a5e2..71d41c479 100644 --- a/cypress/support/constants/constants.js +++ b/cypress/support/constants/constants.js @@ -15,6 +15,12 @@ * * SPDX-License-Identifier: Apache-2.0 */ +let sdkVersion = 'latest'; +const setSdkVersion = (version) => { + sdkVersion = version; + console.log('sdk version after set: ' + sdkVersion); +}; + module.exports = { ACTION: 'action', ACTION_CORE: 'CORE', @@ -44,7 +50,7 @@ module.exports = { BEFORE_OPERATION: 'beforeOperation', BEFORE_OPERATION_TAGS: 'beforeOperationTags', BEFORE_OPERATION_FORMAT: - 'Before operation object is not in proper array format, recheck the before objects in fixture/external/moduleReqId - getBeforeOperationObject', + 'Before operation object is not in proper array format, recheck the before objects in fixture/external//moduleReqId - getBeforeOperationObject', BOOLEAN: 'boolean', CAPABILITIES_INFO: 'capabilities.info', CAPABILITIES_PERMITTED: 'capabilities.permitted', @@ -58,10 +64,10 @@ module.exports = { SUITE_COMMUNICATION_MODE: 'suiteCommunicationMode', CONFIG: 'CONFIG', CONFIG_IMPLEMENTATION_MISSING: 'Config module implementation missing', - CONFIG_MODULE_SETRESPONSE_PATH: 'cypress/fixtures/external/setResponseData.json', + CONFIG_MODULE_SETRESPONSE_PATH: `cypress/fixtures/external/${sdkVersion}/setResponseData.json`, CONTENT: 'Content', CONTEXT: 'Context', - CONTEXT_FILE_PATH: 'cypress/fixtures/apiObjectContext.json', + CONTEXT_FILE_PATH: `cypress/fixtures/${sdkVersion}/apiObjectContext.json`, CORE: 'core', CORRELATIONID: 'correlationId', COUNTRYCODE: 'countryCode', @@ -69,14 +75,14 @@ module.exports = { CURRENT_APP_ID: 'currentAppId', CUSTOM_METHOD_PATH: 'https://github.com/rdkcentral/firebolt-certification-suite/blob/main/cypress/fixtures/docs/validations.md#custom', - CYPRESS_MODULES_PATH: 'cypress/fixtures/external/modules', + CYPRESS_MODULES_PATH: `cypress/fixtures/external/${sdkVersion}/modules`, DATE: 'date', DECIMAL: 'decimal', DECODE: 'decode', DECODEVALUE_JSON_PATH: 'decodeValue.json', - DEFAULT_DEVICE_DATA_PATH: 'cypress/fixtures/defaultDeviceData.json', + DEFAULT_DEVICE_DATA_PATH: `cypress/fixtures/${sdkVersion}/defaultDeviceData.json`, DEFAULT_DIRECTORY: '/tmp/jsonReports/', - DEFAULT_PATH: 'cypress/fixtures/defaultTestData.json', + DEFAULT_PATH: `cypress/fixtures/${sdkVersion}/defaultTestData.json`, DEFAULT_TEST_DATA: 'defaultTestData.json', DEREFERENCE_OPENRPC: 'dereferenceOpenRPC', DEVICE: 'device', @@ -126,7 +132,7 @@ module.exports = { ERROR_LIST: ['Method not found', 'Method Not Implemented'], ERROR_NOT_UNDEFINED_CHECK: 'Error not undefined Check', ERROR_NULL_CHECK: 'Error null Check', - ERROR_CONTENT_OBJECTS_PATH: 'cypress/fixtures/objects/errorContentObjects.json', + ERROR_CONTENT_OBJECTS_PATH: `cypress/fixtures/${sdkVersion}/objects/errorContentObjects.json`, EVENT: 'event', EVENT_ERROR_MSG: 'Event listener error validation', EVENT_LISTENER_RESPONSE: 'eventListenerResponse', @@ -153,11 +159,11 @@ module.exports = { EXPECTED_JSON_IN_VALIDATION_OBJECTS: 'Expected JSON data should be defined in fixtures/objects/validationObjects/', EXPECTING_ERROR: 'expectingError', - EXTERNAL_ERROR_CONTENT_OBJECTS_PATH: 'cypress/fixtures/external/objects/errorContentObjects.json', - EXTERNAL_DEVICES_PATH: 'cypress/fixtures/external/devices/', - EXTERNAL_MODULEREQID_PATH: 'cypress/fixtures/external/objects/moduleReqId/moduleReqId.json', - EXTERNAL_PATH: 'cypress/fixtures/external/modules/', - EXTERNAL_PREREQUISITE_DATA: './cypress/fixtures/external/PreRequisiteData.json', + EXTERNAL_ERROR_CONTENT_OBJECTS_PATH: `cypress/fixtures/external/${sdkVersion}/objects/errorContentObjects.json`, + EXTERNAL_DEVICES_PATH: `cypress/fixtures/external/${sdkVersion}/devices/`, + EXTERNAL_MODULEREQID_PATH: `cypress/fixtures/external/${sdkVersion}/objects/moduleReqId/moduleReqId.json`, + EXTERNAL_PATH: `cypress/fixtures/external/${sdkVersion}/modules/`, + EXTERNAL_PREREQUISITE_DATA: `./cypress/fixtures/external/${sdkVersion}/PreRequisiteData.json`, EXTRACTEDAPI_PATH: 'extractedApiObject.apiResponse.', FAIL: 'FAIL', FAIL_ON_PUBSUB_CONNECTION_ERROR: 'failOnPubSubConnectionError', @@ -171,26 +177,26 @@ module.exports = { FCA_APP_LIST: 'fcaAppList', FB_INTERACTIONLOGS: 'fbInteractionLogs', FCS: 'fcs', - FCS_MODULEREQID_PATH: 'cypress/fixtures/objects/moduleReqId/moduleReqId.json', - FCS_SETRESPONSE_PATH: 'cypress/fixtures/setResponseData.json', + FCS_MODULEREQID_PATH: `cypress/fixtures/${sdkVersion}/objects/moduleReqId/moduleReqId.json`, + FCS_SETRESPONSE_PATH: `cypress/fixtures/${sdkVersion}/setResponseData.json`, FCS_VALIDATION_JSON: 'fCSValidationjson', FIREBOLT: 'firebolt', FIREBOLTCALL: 'fireboltCall', FIREBOLT_OBJECT_DOC_PATH: 'https://github.com/rdkcentral/firebolt-certification-suite/blob/main/cypress/fixtures/docs/dynamicObjects.md#firebolt-object', FIREBOLT_VERSION: 'Firebolt Version', - FIREBOLTCALLS_FROM_CONFIGMODULE: 'cypress/fixtures/external/fireboltCalls/', - FIREBOLTCALLS_FROM_FCS: 'cypress/fixtures/fireboltCalls/', + FIREBOLTCALLS_FROM_CONFIGMODULE: `cypress/fixtures/external/${sdkVersion}/fireboltCalls/`, + FIREBOLTCALLS_FROM_FCS: `cypress/fixtures/${sdkVersion}/fireboltCalls/`, FIREBOLTCONFIG: 'fireboltConfig', FIREBOLTMOCK: 'fireboltMock', - FIREBOLTMOCK_FROM_CONFIGMODULE: 'cypress/fixtures/external/fireboltMocks/', - FIREBOLTMOCK_FROM_FCS: 'cypress/fixtures/fireboltMocks/', + FIREBOLTMOCK_FROM_CONFIGMODULE: `cypress/fixtures/external/${sdkVersion}/fireboltMocks/`, + FIREBOLTMOCK_FROM_FCS: `cypress/fixtures/${sdkVersion}/fireboltMocks/`, FIREBOLT_SPECIFICATION_NEXT_URL: 'firebolt_specification_next_url', FIREBOLT_SPECIFICATION_PROPOSED_URL: 'firebolt_specification_proposed_url', FIREBOLT_SPECIFICATION_URL: 'firebolt_specification_url', FIRST_PARTY_APP: '1st party app', - VALIDATION_OBJECTS_PATH: 'cypress/fixtures/objects/validationObjects/', - CONFIG_VALIDATION_OBJECTS_PATH: 'cypress/fixtures/external/objects/validationObjects/', + VALIDATION_OBJECTS_PATH: `cypress/fixtures/${sdkVersion}/objects/validationObjects/`, + CONFIG_VALIDATION_OBJECTS_PATH: `cypress/fixtures/external/${sdkVersion}/objects/validationObjects/`, FIXTURE: 'fixture', FIXTURE_DEFINED_PATH: 'Expected JSON data should be defined in fixtures/objects/validationObjects/', @@ -277,7 +283,7 @@ module.exports = { MODE_SDK: 'SDK', MODE_TRANSPORT: 'Transport', MODULEREQIDJSON: 'moduleReqIdJson', - MODULES_PATH: 'cypress/fixtures/modules/', + MODULES_PATH: `cypress/fixtures/${sdkVersion}/modules/`, MODULE_NAMES: { DEVICE: 'device', ADVERTISING: 'advertising', @@ -338,8 +344,8 @@ module.exports = { PUB_SUB_PUBLISH_SUFFIX: 'pubSubPublishSuffix', PUB_SUB_SUBSCRIBE_SUFFIX: 'pubSubSubscribeSuffix', SETUPCHECK: 'Setup Check', - SETUPVALUES: 'external/setupValues.json', - SETUPVALUES_FILEPATH: 'cypress/fixtures/external/setupValues.json', + SETUPVALUES: `external/${sdkVersion}/setupValues.json`, + SETUPVALUES_FILEPATH: `cypress/fixtures/external/${sdkVersion}/setupValues.json`, PREVIOUS_TEST_TYPE: 'previousTestType', PROPOSED: 'proposed', PUBLISH: 'publish', @@ -489,8 +495,8 @@ module.exports = { CREATE_MARKER: 'createMarker', MODULE_OVERRIDES: ['fcs', 'performance'], COMBINEDDEFAULTTESTDATA: 'combinedDefaultTestData', - CONFIG_DEFAULTTESTDATA_PATH: 'cypress/fixtures/external/defaultTestData.json', - FCS_DEFAULTTESTDATA_PATH: 'cypress/fixtures/defaultTestData.json', + CONFIG_DEFAULTTESTDATA_PATH: `cypress/fixtures/external/${sdkVersion}/defaultTestData.json`, + FCS_DEFAULTTESTDATA_PATH: `cypress/fixtures/${sdkVersion}/defaultTestData.json`, ENV_SETUP_STATUS: 'environmentLaunched', APP_LAUNCH_STATUS: 'appLaunched', VISIBILITYSTATE_VALIDATION_REQ: ' Lifecycle visibility state validation ', @@ -518,6 +524,7 @@ module.exports = { FOREGROUND: 'FOREGROUND', PERFORMANCE_VALIDATION: 'performanceValidation', MARKER_CREATION_STATUS: 'markerCreationStatus', + setSdkVersion, }; function getSanityReportPath() { // Check if Cypress is defined, for cypress test context diff --git a/cypress/support/cypress-commands/commands.js b/cypress/support/cypress-commands/commands.js index f0193ffb9..a0b25ff26 100644 --- a/cypress/support/cypress-commands/commands.js +++ b/cypress/support/cypress-commands/commands.js @@ -260,7 +260,8 @@ Cypress.Commands.add('updateRunInfo', () => { return false; } const deviceMac = UTILS.getEnvVariable(CONSTANTS.DEVICE_MAC).replace(/:/g, ''); - const deviceMacJson = `./cypress/fixtures/devices/${deviceMac}.json`; + const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest'; + const deviceMacJson = `./cypress/fixtures/${sdkVersion}/devices/${deviceMac}.json`; // Check if mac json file exists cy.task('checkFileExists', deviceMacJson) .then((exists) => { @@ -434,7 +435,8 @@ Cypress.Commands.add('getDeviceDataFromThirdPartyApp', (method, params, action) * cy.getLatestFireboltJsonFromFixtures() */ Cypress.Commands.add('getLatestFireboltJsonFromFixtures', () => { - cy.task('readFilesFromDir', 'cypress/fixtures/versions/').then((filesData) => { + const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest'; + cy.task('readFilesFromDir', `cypress/fixtures/${sdkVersion}/versions/`).then((filesData) => { try { // Reading a greater version value from the versions folder. const version = filesData @@ -495,7 +497,8 @@ Cypress.Commands.add('getFireboltJsonData', () => { // If cy.request fails, get specific firebolt.json from -cypress/fixtures/versions/${Cypress.env(CONSTANTS.SDK_VERSION)}/firebolt.json else { - const configImportPath = `cypress/fixtures/versions/${UTILS.getEnvVariable( + const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest'; + const configImportPath = `cypress/fixtures/${sdkVersion}/versions/${UTILS.getEnvVariable( CONSTANTS.SDK_VERSION )}/firebolt.json`; diff --git a/cypress/support/cypress-support/src/main.js b/cypress/support/cypress-support/src/main.js index f56572d6c..0e2507e45 100644 --- a/cypress/support/cypress-support/src/main.js +++ b/cypress/support/cypress-support/src/main.js @@ -25,15 +25,21 @@ const defaultDirectory = CONSTANTS.DEFAULT_DIRECTORY; const jsonFile = CONSTANTS.JSON_FILE_EXTENSION; const UTILS = require('./utils'); const path = require('path'); +const fs = require('fs'); const logger = require('../../Logger')('main.js'); const setimmediate = require('setimmediate'); let appTransport; const flatted = require('flatted'); const _ = require('lodash'); -const internalV2FireboltCallsData = require('../../../fixtures/fireboltCalls/index'); -const externalV2FireboltCallsData = require('../../../fixtures/external/fireboltCalls/index'); -const internalV2FireboltMockData = require('../../../fixtures/fireboltCalls/index'); -const externalV2FireboltMockData = require('../../../fixtures/external/fireboltCalls/index'); +const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest'; +console.log('2204 sdk version: ', sdkVersion); +const sample = require(`../../../fixtures/latest/fireboltCalls/index`); +console.log('2204 sdk version: ', sample); +// console.log('2204 file exists: ', fs.existsSync(sample)); +let internalV2FireboltCallsData, + externalV2FireboltCallsData, + internalV2FireboltMockData, + externalV2FireboltMockData; export default function (module) { const config = new Config(module); @@ -46,7 +52,11 @@ export default function (module) { // before All before(() => { - // Added below custom commands to clear cache and to reload browser + cy.task('getFireboltCallsData', { sdkVersion }).then((data) => { + internalV2FireboltCallsData = data; + + console.log('2204 Internal Firebolt Calls Data:', internalV2FireboltCallsData); + }); cy.clearCache(); cy.wrap(UTILS.pubSubClientCreation(appTransport), { timeout: CONSTANTS.SEVEN_SECONDS_TIMEOUT, diff --git a/cypress/support/cypress-support/src/utils.js b/cypress/support/cypress-support/src/utils.js index 900fbf2dc..b42269896 100644 --- a/cypress/support/cypress-support/src/utils.js +++ b/cypress/support/cypress-support/src/utils.js @@ -434,6 +434,9 @@ function stackTrace() { */ function lifecycleHistorySchemaValidation(result, schema, lifecycleHistoryRecordType, envKey) { const schemaValidationResult = validator.validate(result, schema); + const sdkVersion = getEnvVariable( + CONSTANTS.SDK_VERSION + ) || 'latest'; if ( lifecycleHistoryRecordType == CONSTANTS.TASK.STOPLIFECYCLERECORDING && @@ -444,7 +447,7 @@ function lifecycleHistorySchemaValidation(result, schema, lifecycleHistoryRecord ) { assert( false, - `Schema Validation Failed: Response must follow the format specified in "cypress/fixtures/schemas/lifecycleHistorySchema.json", Errors: ${schemaValidationResult.errors} ` + `Schema Validation Failed: Response must follow the format specified in "cypress/fixtures/${sdkVersion}/schemas/lifecycleHistorySchema.json", Errors: ${schemaValidationResult.errors} ` ); } diff --git a/cypress/support/validations/decodeValidation.js b/cypress/support/validations/decodeValidation.js index d496ca9a6..75e28b738 100644 --- a/cypress/support/validations/decodeValidation.js +++ b/cypress/support/validations/decodeValidation.js @@ -15,8 +15,10 @@ * * SPDX-License-Identifier: Apache-2.0 */ -const REGEXFORMATS = require('../../fixtures/regexformats'); +import UTILS from '../cypress-support/src/utils'; const CONSTANTS = require('../constants/constants'); +const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION) || 'latest'; +const REGEXFORMATS = require(`../../fixtures/${sdkVersion}/regexformats`); const RegexParser = require('regex-parser'); /** diff --git a/cypress/support/validations/regExValidation.js b/cypress/support/validations/regExValidation.js index 6ef2df72f..4f5a8dc5e 100644 --- a/cypress/support/validations/regExValidation.js +++ b/cypress/support/validations/regExValidation.js @@ -15,8 +15,10 @@ * * SPDX-License-Identifier: Apache-2.0 */ -const REGEXFORMATS = require('../../fixtures/regexformats'); +import UTILS from '../cypress-support/src/utils'; const CONSTANTS = require('../constants/constants'); +const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION) || 'latest'; +const REGEXFORMATS = require(`../../fixtures/${sdkVersion}/regexformats`); const RegexParser = require('regex-parser'); /** * @module regExValidations diff --git a/specHelperConfig.js b/specHelperConfig.js index df0b0bb58..09e337f4b 100644 --- a/specHelperConfig.js +++ b/specHelperConfig.js @@ -25,17 +25,17 @@ const logger = require('./cypress/support/Logger')('specHelperConfig.js'); @returns {Array} Array containing the spec pattern(s) based on the provided testSuite. */ -function getSpecPattern(testSuite) { +function getSpecPattern(testSuite, sdkVersion = 'latest') { const patterns = { module: [ - '**/FireboltCertification/*.feature', - '**/FireboltCertification/*/*.feature', - '**/Distributor/*.feature', - '**/Distributor/*/*.feature', + `**/${sdkVersion}/FireboltCertification/*.feature`, + `**/${sdkVersion}/FireboltCertification/*/*.feature`, + `**/Distributor/${sdkVersion}/*.feature`, + `**/Distributor/${sdkVersion}/*/*.feature`, ], - certification: '**/Sanity/*.feature', - sample: '**/Sample/*.feature', - all: '**/*.feature', + certification: `**/${sdkVersion}/Sanity/*.feature`, + sample: `**/${sdkVersion}/Sample/*.feature`, + all: `**/${sdkVersion}/*.feature`, }; // Convert testSuite to lowercase and trim whitespace const trimmedTestSuite = testSuite ? testSuite.trim().toLowerCase() : null;