SW-2967 resolve bugs of the v01.3.0 test (#1712)

* fix guided tour design file selection * fix failing analytics cypress test
mrbeam · Mar 15, 2023 · 337ef02 · 337ef02
1 parent 178f372
commit 337ef02
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/cypress/e2e/settings/analytics.cy.js b/cypress/e2e/settings/analytics.cy.js
@@ -16,17 +16,12 @@ describe("Navbar icons", function () {
             force: true,
         });
     });
-    it("More information about what data we use", function () {
-        cy.get('[id="settings_plugin_mrbeam_analytics_link"]').click();
-        cy.get(".mb-0 > .btn-link").click();
-        cy.get(".card-body").should("to.visible");
-        cy.wait(3000);
-        cy.get(".analytics-collapsible").click();
-        cy.get(".card-body").should("not.visible");
-    });
+
     it("Privacy policy", function () {
         cy.get('[id="settings_plugin_mrbeam_analytics_link"]').click();
-        cy.get('[style="color: darkgray;font-size: 0.9em"] > a')
+        cy.get(
+            '[data-test="mrbeam-ui-settings-better-together-privacy-policy-btn"]'
+        )
             .invoke("attr", "href")
             .then((myLink) => {
                 cy.request(myLink).then((resp) => {

diff --git a/octoprint_mrbeam/static/js/app/view-models/tour.js b/octoprint_mrbeam/static/js/app/view-models/tour.js
@@ -249,6 +249,9 @@ $(function () {
                         $(
                             '.file_list_entry[mrb_name="Schluesselanhaenger.svg"]'
                         )[0] ||
+                        $(
+                            '.file_list_entry[mrb_name="Schlusselanhanger.svg"]'
+                        )[0] ||
                         $(
                             ".gcode_files .entry.files_template_model_svg .file_list_entry "
                         ).last()[0],

diff --git a/octoprint_mrbeam/templates/settings/analytics_settings.jinja2 b/octoprint_mrbeam/templates/settings/analytics_settings.jinja2
@@ -33,7 +33,7 @@
                             </div>
                         </div>
                         <div class="span6">
-                            <div class="privacy-policy"><a target="_blank" href="{{ url_for('plugin.mrbeam.static', filename='docs/MrBeamAnalytics-PrivacyPolicy_en.pdf') }}">{{ _('Privacy policy') }}</a></div>
+                            <div class="privacy-policy"><a target="_blank" href="{{ url_for('plugin.mrbeam.static', filename='docs/MrBeamAnalytics-PrivacyPolicy_en.pdf') }}" data-test="mrbeam-ui-settings-better-together-privacy-policy-btn">{{ _('Privacy policy') }}</a></div>
                         </div>
                     </div>
                 </li>
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ @@
                                 </div>
                             </div>
                             <div class="span6">
-                                <div class="privacy-policy"><a target="_blank" href="{{ url_for('plugin.mrbeam.static', filename='docs/MrBeamAnalytics-PrivacyPolicy_en.pdf') }}">{{ _('Privacy policy') }}</a></div>
+                                <div class="privacy-policy"><a target="_blank" href="{{ url_for('plugin.mrbeam.static', filename='docs/MrBeamAnalytics-PrivacyPolicy_en.pdf') }}" data-test="mrbeam-ui-settings-better-together-privacy-policy-btn">{{ _('Privacy policy') }}</a></div>
                             </div>
                         </div>
                     </li>
@@ Expand Down @@