Skip to content

Commit 98c4e10

Browse files
authored
Merge branch 'master' into ar2rsawseen/master
2 parents 3363f18 + 375aca4 commit 98c4e10

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

bin/countly.install_rhel.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ cp "$DIR/config/supervisord.example.conf" "$DIR/config/supervisord.conf"
5050
if [[ "$CENTOS_MAJOR" = "9" ]]; then
5151
sudo rpm -ivh https://pkgs.sysadmins.ws/el8/base/x86_64/ipa-gothic-fonts-003.03-15.el8.noarch.rpm
5252
else
53-
sudo yum install https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-3.el8.noarch.rpm
53+
sudo yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-3.el8.noarch.rpm
5454
sudo yum install -y ipa-gothic-fonts
5555
fi
5656

ui-tests/cypress/lib/dashboard/manage/configurations/configurations.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -724,8 +724,7 @@ const verifyPageElements = () => {
724724
});
725725

726726
cy.verifyElement({
727-
element: configurationsListBoxElements({ subFeature: SETTINGS.SECURITY.API_ADDITIONAL_HEADERS }).SELECTED_SUBFEATURE_TEXTAREA,
728-
value: "X-Frame-Options:deny\nX-XSS-Protection:1; mode=block\nAccess-Control-Allow-Origin:*",
727+
element: configurationsListBoxElements({ subFeature: SETTINGS.SECURITY.API_ADDITIONAL_HEADERS }).SELECTED_SUBFEATURE_TEXTAREA
729728
});
730729

731730
cy.verifyElement({
@@ -740,7 +739,6 @@ const verifyPageElements = () => {
740739

741740
cy.verifyElement({
742741
element: configurationsListBoxElements({ subFeature: SETTINGS.SECURITY.DASHBOARD_ADDITIONAL_HEADERS }).SELECTED_SUBFEATURE_TEXTAREA,
743-
value: "X-Frame-Options:deny\nX-XSS-Protection:1; mode=block\nStrict-Transport-Security:max-age=31536000 ; includeSubDomains\nX-Content-Type-Options: nosniff"
744742
});
745743

746744
cy.verifyElement({
@@ -1844,4 +1842,4 @@ const verifyPageElements = () => {
18441842

18451843
module.exports = {
18461844
verifyPageElements
1847-
};
1845+
};

0 commit comments

Comments
 (0)