npm - countly-sdk-web - Versions diffs - 23.2.0 → 23.2.2 - Mend

countly-sdk-web 23.2.0 → 23.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

package/.eslintignore +1 -4
package/.eslintrc.js +1 -0
package/.github/workflows/node.js.yml +0 -3
package/CHANGELOG.md +6 -0
package/README.md +3 -4
package/countly-sdk-web-23.2.2.tgz +0 -0
package/cypress/.eslintrc.js +1 -0
package/cypress/fixtures/multi_instance.html +161 -0
package/cypress/integration/consents.js +19 -72
package/cypress/integration/heatmaps.js +98 -54
package/cypress/integration/integration.js +60 -0
package/cypress/integration/multi_instance.js +25 -0
package/cypress/integration/sessions.js +6 -3
package/cypress/integration/user_agent.js +1 -1
package/cypress/integration/user_details.js +180 -133
package/cypress/integration/views.js +180 -11
package/cypress/support/commands.js +2 -0
package/cypress/support/helper.js +138 -1
package/examples/Angular/package.json +3 -5
package/examples/example_multiple_instances.html +1 -1
package/examples/example_rating_widgets.html +2 -3
package/examples/examples_feedback_widgets.html +18 -7
package/examples/react/package.json +4 -5
package/examples/symbolication/package.json +7 -9
package/examples/symbolication/webpack.config.js +11 -19
package/lib/countly.js +58 -67
package/lib/countly.min.js +92 -91
package/package.json +8 -11
package/countly-sdk-web-23.02.0.tgz +0 -0
package/inch.json +0 -7
package/webpack.config.js +0 -12

package/.eslintignore CHANGED Viewed

@@ -1,5 +1,4 @@
 lib/countly.min.js
-lib/countly.pack.js
 plugin/boomerang/boomerang.min.js
 examples/react
 examples/symbolication
@@ -10,7 +9,5 @@ node_modules
 CHANGELOG.md
 cypress.json
 generateDocs.sh
-inch.json
 jsdoc_conf.json
-LICENSE
-webpack.config.js
+LICENSE

package/.eslintrc.js CHANGED Viewed

@@ -18,6 +18,7 @@ module.exports = {
         "comma-dangle": "off",
         "no-restricted-globals": "off",
         "no-restricted-properties": "off",
+        strict: "off",
         //
         "no-unused-vars": "warn",
         "no-var": "off",

package/.github/workflows/node.js.yml CHANGED Viewed

@@ -28,8 +28,5 @@ jobs:
       - name: Install dependencies
         run: npm install --legacy-peer-deps
-      - name: Build project (if present)
-        run: npm run build --if-present
       - name: Run tests
         run: npm test

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,9 @@
+## 23.2.2
+- Default max segmentation value count changed from 30 to 100
+## 23.02.1
+- Mitigated an issue that could have caused view IDs to be terminated prematurely when using manual sessions and end_session was called abruptly
 ## 23.02.0
 - Events are now recorded with an internal ID.
 - Mitigated an issue where users could have truncate an internal event key

package/README.md CHANGED Viewed

@@ -12,8 +12,7 @@ and [desktop](https://countly.com/desktop-analytics) applications. [Ensuring pri
 Track, measure, and take action - all without leaving Countly.
-* **Slack user?** [Join our Slack Community](https://slack.count.ly)
-* **Questions or feature requests?** [Post in our Community Forum](https://support.count.ly/hc/en-us/community/topics)
+* **Questions or feature requests?** [Join the Countly Community on Discord](https://discord.gg/countly)
 * **Looking for the Countly Server?** [Countly Community Edition repository](https://github.com/Countly/countly-server)
 * **Looking for other Countly SDKs?** [An overview of all Countly SDKs for mobile, web and desktop](https://support.count.ly/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs#officially-supported-sdks)
@@ -56,6 +55,6 @@ If you like Countly, [why not use one of our badges](https://countly.com/brand-g
 ```
 ## How can I help you with your efforts?
-Glad you asked! We need ideas, feedback and constructive comments. All your suggestions will be taken care of with utmost importance. For feature requests and engaging with the community, join [our Slack Community](https://slack.count.ly) or [Community Forum](https://support.count.ly/hc/en-us/community/topics).
+Glad you asked! For community support, feature requests, and engaging with the Countly Community, please join us at [our Discord Server](https://discord.gg/countly). We're excited to have you there!
-We are on [Twitter](https://twitter.com/gocountly), [Facebook](https://www.facebook.com/Countly) and [LinkedIn](https://www.linkedin.com/company/countly) if you would like to keep up with Countly related updates.
+Also, we are on [Twitter](https://twitter.com/gocountly) and [LinkedIn](https://www.linkedin.com/company/countly) if you would like to keep up with Countly related updates.

package/countly-sdk-web-23.2.2.tgz ADDED Viewed

Binary file

package/cypress/.eslintrc.js CHANGED Viewed

@@ -9,6 +9,7 @@ module.exports = {
         "cypress/no-assigning-return-values": "error",
         "cypress/no-unnecessary-waiting": "off",
         "cypress/assertion-before-screenshot": "warn",
+        "cypress/unsafe-to-chain-command": "warn",
         "cypress/no-force": "warn",
         "cypress/no-async-tests": "error",
         "cypress/no-pause": "error",

package/cypress/fixtures/multi_instance.html ADDED Viewed

@@ -0,0 +1,161 @@
+<html>
+<head>
+    <script type='text/javascript' src='../../lib/countly.js'></script>
+    <script type='text/javascript' src='../support/integration_helper.js'></script>
+    <script type='text/javascript'>
+        // here we implement a cookie and localStorage clearing logic
+        const deleteAllCookies = () => {
+            const cookies = document.cookie.split(";");
+            for (const cookie of cookies) {
+                const eqPos = cookie.indexOf("=");
+                const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+                document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT";
+            }
+        }
+        window.localStorage.clear();
+        deleteAllCookies();
+        console.error("cleared the storage");
+        // ==================================================
+        // synchronously
+        // ==================================================
+        //initializing first instance, which will be global Countly
+        Countly.init({
+            app_key: "YOUR_APP_KEY1",
+            url: "https://try.count.ly",
+            test_mode: true
+        })
+        Countly.remove_consent();
+        Countly.disable_offline_mode();
+        Countly.add_event({ key: "test", count: 1, sum: 1, dur: 1, segmentation: { test: "test" } });
+        Countly.start_event("test");
+        Countly.cancel_event("gobbledygook");
+        Countly.end_event("test");
+        Countly.report_conversion("camp_id", "camp_user_id");
+        Countly.recordDirectAttribution("camp_id", "camp_user_id");
+        Countly.user_details({ name: "name" });
+        Countly.userData.set("set", "set");
+        Countly.userData.save();
+        Countly.report_trace({ name: "name", stz: 1, type: "type" });
+        Countly.log_error({ error: "error", stack: "stack" });
+        Countly.add_log("error");
+        Countly.fetch_remote_config();
+        Countly.enrollUserToAb();
+        Countly.track_sessions();
+        Countly.track_pageview();
+        Countly.track_errors();
+        Countly.track_clicks();
+        Countly.track_scrolls();
+        Countly.track_links();
+        Countly.track_forms();
+        Countly.collect_from_forms();
+        Countly.collect_from_facebook();
+        Countly.opt_in();
+        //initialize second instance for another app synchronously
+        var Countly2 = Countly.init({
+            app_key: "YOUR_APP_KEY2", //must have different APP key
+            url: "https://try.count.ly",
+            test_mode: true
+        });
+        Countly2.remove_consent();
+        Countly2.disable_offline_mode();
+        Countly2.add_event({ key: "test", count: 1, sum: 1, dur: 1, segmentation: { test: "test" } });
+        Countly2.start_event("test");
+        Countly2.cancel_event("gobbledygook");
+        Countly2.end_event("test");
+        Countly2.report_conversion("camp_id", "camp_user_id");
+        Countly2.recordDirectAttribution("camp_id", "camp_user_id");
+        Countly2.user_details({ name: "name" });
+        Countly2.userData.set("set", "set");
+        Countly2.userData.save();
+        Countly2.report_trace({ name: "name", stz: 1, type: "type" });
+        Countly2.log_error({ error: "error", stack: "stack" });
+        Countly2.add_log("error");
+        Countly2.fetch_remote_config();
+        Countly2.enrollUserToAb();
+        Countly2.track_sessions();
+        Countly2.track_pageview();
+        Countly2.track_errors();
+        Countly2.track_clicks();
+        Countly2.track_scrolls();
+        Countly2.track_links();
+        Countly2.track_forms();
+        Countly2.collect_from_forms();
+        Countly2.collect_from_facebook();
+        Countly2.opt_in();
+        // ==================================================
+        // asynchronously
+        // ==================================================
+        //initialize third instance for another app asynchronously
+        Countly.q.push(["init", {
+            app_key: "YOUR_APP_KEY3", //must have different APP key
+            url: "https://try.count.ly",
+            test_mode: true
+        }])
+        Countly.q.push(["YOUR_APP_KEY3", "remove_consent"]);
+        Countly.q.push(["YOUR_APP_KEY3", "disable_offline_mode"]);
+        Countly.q.push(["YOUR_APP_KEY3", "add_event", { key: "test", count: 1, sum: 1, dur: 1, segmentation: { test: "test" } }]);
+        Countly.q.push(["YOUR_APP_KEY3", "start_event", "test"]);
+        Countly.q.push(["YOUR_APP_KEY3", "cancel_event", "gobbledygook"]);
+        Countly.q.push(["YOUR_APP_KEY3", "end_event", "test"]);
+        Countly.q.push(["YOUR_APP_KEY3", "report_conversion", "camp_id", "camp_user_id"]);
+        Countly.q.push(["YOUR_APP_KEY3", "recordDirectAttribution", "camp_id", "camp_user_id"]);
+        Countly.q.push(["YOUR_APP_KEY3", "user_details", { name: "name" }]);
+        Countly.q.push(["YOUR_APP_KEY3", "userData.set", "set", "set"]);
+        Countly.q.push(["YOUR_APP_KEY3", "userData.save"]);
+        Countly.q.push(["YOUR_APP_KEY3", "report_trace", { name: "name", stz: 1, type: "type" }]);
+        Countly.q.push(["YOUR_APP_KEY3", "log_error", { error: "error", stack: "stack" }]);
+        Countly.q.push(["YOUR_APP_KEY3", "add_log", "error"]);
+        Countly.q.push(["YOUR_APP_KEY3", "fetch_remote_config"]);
+        Countly.q.push(["YOUR_APP_KEY3", "enrollUserToAb"]);
+        Countly.q.push(["YOUR_APP_KEY3", "track_sessions"]);
+        Countly.q.push(["YOUR_APP_KEY3", "track_pageview"]);
+        Countly.q.push(["YOUR_APP_KEY3", "track_errors"]);
+        Countly.q.push(["YOUR_APP_KEY3", "track_clicks"]);
+        Countly.q.push(["YOUR_APP_KEY3", "track_scrolls"]);
+        Countly.q.push(["YOUR_APP_KEY3", "track_links"]);
+        Countly.q.push(["YOUR_APP_KEY3", "track_forms"]);
+        Countly.q.push(["YOUR_APP_KEY3", "collect_from_forms"]);
+        Countly.q.push(["YOUR_APP_KEY3", "collect_from_facebook"]);
+        Countly.q.push(["YOUR_APP_KEY3", "opt_in"]);
+        //initialize fourth instance for another app asynchronously
+        Countly.q.push(["init", {
+            app_key: "YOUR_APP_KEY4", //must have different APP key
+            url: "https://try.count.ly",
+            test_mode: true
+        }])
+        Countly.q.push(["YOUR_APP_KEY4", "remove_consent"]);
+        Countly.q.push(["YOUR_APP_KEY4", "disable_offline_mode"]);
+        Countly.q.push(["YOUR_APP_KEY4", "add_event", { key: "test", count: 1, sum: 1, dur: 1, segmentation: { test: "test" } }]);
+        Countly.q.push(["YOUR_APP_KEY4", "start_event", "test"]);
+        Countly.q.push(["YOUR_APP_KEY4", "cancel_event", "gobbledygook"]);
+        Countly.q.push(["YOUR_APP_KEY4", "end_event", "test"]);
+        Countly.q.push(["YOUR_APP_KEY4", "report_conversion", "camp_id", "camp_user_id"]);
+        Countly.q.push(["YOUR_APP_KEY4", "recordDirectAttribution", "camp_id", "camp_user_id"]);
+        Countly.q.push(["YOUR_APP_KEY4", "user_details", { name: "name" }]);
+        Countly.q.push(["YOUR_APP_KEY4", "userData.set", "set", "set"]);
+        Countly.q.push(["YOUR_APP_KEY4", "userData.save"]);
+        Countly.q.push(["YOUR_APP_KEY4", "report_trace", { name: "name", stz: 1, type: "type" }]);
+        Countly.q.push(["YOUR_APP_KEY4", "log_error", { error: "error", stack: "stack" }]);
+        Countly.q.push(["YOUR_APP_KEY4", "add_log", "error"]);
+        Countly.q.push(["YOUR_APP_KEY4", "fetch_remote_config"]);
+        Countly.q.push(["YOUR_APP_KEY4", "enrollUserToAb"]);
+        Countly.q.push(["YOUR_APP_KEY4", "track_sessions"]);
+        Countly.q.push(["YOUR_APP_KEY4", "track_pageview"]);
+        Countly.q.push(["YOUR_APP_KEY4", "track_errors"]);
+        Countly.q.push(["YOUR_APP_KEY4", "track_clicks"]);
+        Countly.q.push(["YOUR_APP_KEY4", "track_scrolls"]);
+        Countly.q.push(["YOUR_APP_KEY4", "track_links"]);
+        Countly.q.push(["YOUR_APP_KEY4", "track_forms"]);
+        Countly.q.push(["YOUR_APP_KEY4", "collect_from_forms"]);
+        Countly.q.push(["YOUR_APP_KEY4", "collect_from_facebook"]);
+        Countly.q.push(["YOUR_APP_KEY4", "opt_in"]);
+    </script>
+</head>
+</html>

package/cypress/integration/consents.js CHANGED Viewed

@@ -14,59 +14,6 @@ function initMain(consent) {
         debug: true
     });
 }
-// gathered events. count and segmentation key/values must be consistent
-const eventArray = [
-    // first event must be custom event
-    {
-        key: "a",
-        count: 1,
-        segmentation: {
-            1: "1"
-        }
-    },
-    // rest can be internal events
-    {
-        key: "[CLY]_view",
-        count: 2,
-        segmentation: {
-            2: "2"
-        }
-    },
-    {
-        key: "[CLY]_nps",
-        count: 3,
-        segmentation: {
-            3: "3"
-        }
-    },
-    {
-        key: "[CLY]_survey",
-        count: 4,
-        segmentation: {
-            4: "4"
-        }
-    },
-    {
-        key: "[CLY]_star_rating",
-        count: 5,
-        segmentation: {
-            5: "5"
-        }
-    },
-    {
-        key: "[CLY]_orientation",
-        count: 6,
-        segmentation: {
-            6: "6"
-        }
-    }
-];
-// event adding loop
-function events() {
-    for (var i = 0, len = eventArray.length; i < len; i++) {
-        Countly.add_event(eventArray[i]);
-    }
-}
 /**
  * Checks a queue object for valid/correct values/limits during consent tests
@@ -101,51 +48,51 @@ describe("Consent tests", () => {
         hp.haltAndClearStorage(() => {
             initMain(true);
             Countly.add_consent(["events"]);
-            events();
+            hp.events();
             cy.fetch_local_event_queue().then((eq) => {
                 expect(eq.length).to.equal(1);
-                consent_check(eq, eventArray, true);
+                consent_check(eq, hp.eventArray, true);
             });
         });
     });
     it("All but custom event should be sent to the queue", () => {
         hp.haltAndClearStorage(() => {
             initMain(true);
-            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback"]);
-            events();
+            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback", "push", "clicks"]);
+            hp.events();
             cy.fetch_local_event_queue().then((eq) => {
-                expect(eq.length).to.equal(5);
-                consent_check(eq, eventArray, false, true);
+                expect(eq.length).to.equal(6);
+                consent_check(eq, hp.eventArray, false, true);
             });
         });
     });
     it("All consents given and all events should be recorded", () => {
         hp.haltAndClearStorage(() => {
             initMain(true);
-            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback", "events"]);
-            events();
+            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback", "events", "push", "clicks"]);
+            hp.events();
             cy.fetch_local_event_queue().then((eq) => {
-                expect(eq.length).to.equal(6);
-                consent_check(eq, eventArray, false, false);
+                expect(eq.length).to.equal(7);
+                consent_check(eq, hp.eventArray, false, false);
             });
         });
     });
     it("No consent required and all events should be recorded", () => {
         hp.haltAndClearStorage(() => {
             initMain(false);
-            events();
+            hp.events();
             cy.fetch_local_event_queue().then((eq) => {
-                expect(eq.length).to.equal(6);
-                consent_check(eq, eventArray, false, false);
+                expect(eq.length).to.equal(7);
+                consent_check(eq, hp.eventArray, false, false);
             });
         });
     });
     it("Non-merge ID change should reset all consents", () => {
         hp.haltAndClearStorage(() => {
             initMain(true);
-            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback"]);
+            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback", "push", "clicks"]);
             Countly.change_id("Richard Wagner II", false);
-            events();
+            hp.events();
             cy.fetch_local_event_queue().then((eq) => {
                 expect(eq.length).to.equal(0);
             });
@@ -154,12 +101,12 @@ describe("Consent tests", () => {
     it("Merge ID change should not reset consents", () => {
         hp.haltAndClearStorage(() => {
             initMain(true);
-            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback"]);
+            Countly.add_consent(["sessions", "views", "users", "star-rating", "apm", "feedback", "push", "clicks"]);
             Countly.change_id("Richard Wagner the second", true);
-            events();
+            hp.events();
             cy.fetch_local_event_queue().then((eq) => {
-                expect(eq.length).to.equal(5);
-                consent_check(eq, eventArray, false, true);
+                expect(eq.length).to.equal(6);
+                consent_check(eq, hp.eventArray, false, true);
             });
         });
     });

package/cypress/integration/heatmaps.js CHANGED Viewed

@@ -16,24 +16,40 @@ function click_check(segmentation, offX, offY) {
 }
 describe("Browser heatmap tests, scrolls", () => {
-    it("Check if scrolls are sent if page url changes", () => {
+    it("Check if scrolls are sent if page url changes, multi page", () => {
         cy.visit("./cypress/fixtures/scroll_test.html");
         cy.scrollTo("bottom");
         cy.visit("./cypress/fixtures/scroll_test_2.html");
-        cy.fetch_local_request_queue(hp.appKey).then((rq) => {
-            cy.log(rq);
-            // 2 session and 1 orientation 1 event
-            expect(rq.length).to.equal(4);
-            // first object of the queue should be about begin session, second is orientation
-            cy.check_session(rq[0], undefined, undefined, hp.appKey);
-            cy.check_view_event(JSON.parse(rq[1].events)[1], "/cypress/fixtures/scroll_test.html", undefined, false);
-            // third object of the queue should be about session extension, also input the expected duration range, we expect 0 here so we enter a value lower than that but not deviated more than 1
-            cy.check_session(rq[2], -0.5, undefined);
-            // fourth object of the queue should be events in the queue, there must be 4 of them
-            cy.check_view_event(JSON.parse(rq[3].events)[0], "/cypress/fixtures/scroll_test.html", 0, false);
-            cy.check_scroll_event(JSON.parse(rq[3].events)[1]);
-            // number 3 is orientation
-            cy.check_view_event(JSON.parse(rq[3].events)[3], "/cypress/fixtures/scroll_test_2.html", undefined, false); // new page not new view
+        hp.waitFunction(hp.getTimestampMs(), 1000, 100, () => {
+            cy.fetch_local_request_queue(hp.appKey).then((rq) => {
+                cy.log(rq);
+                // There should be 4 requests: session -> event batch 1 -> session_duration -> event batch 2
+                expect(rq.length).to.equal(4);
+                const beginSessionReq = rq[0];
+                const eventBatch1 = JSON.parse(rq[1].events);
+                const sessionDurationReq = rq[2];
+                const eventBatch2 = JSON.parse(rq[3].events);
+                // 1st req
+                cy.check_session(beginSessionReq, undefined, undefined, hp.appKey);
+                // 2nd req
+                expect(eventBatch1.length).to.equal(2);
+                expect(eventBatch1[0].key).to.equal("[CLY]_orientation");
+                expect(eventBatch1[0].segmentation.mode).to.be.ok;
+                cy.check_view_event(eventBatch1[1], "/cypress/fixtures/scroll_test.html", undefined, false); // start view
+                // 3rd object of the req queue should be about session extension, also input the expected duration range, we expect 0 here so we enter a value lower than that but not deviated more than 1
+                cy.check_session(sessionDurationReq, -0.5, undefined);
+                // 4th object of the queue should be events in the queue, there must be 4 of them
+                expect(eventBatch2.length).to.equal(4);
+                cy.check_view_event(eventBatch2[0], "/cypress/fixtures/scroll_test.html", 0, false); // end view
+                cy.check_scroll_event(eventBatch2[1]);
+                expect(eventBatch2[2].key).to.equal("[CLY]_orientation");
+                expect(eventBatch2[2].segmentation.mode).to.be.ok;
+                cy.check_view_event(eventBatch2[3], "/cypress/fixtures/scroll_test_2.html", undefined, false); // new page
+            });
         });
     });
     it("Check if scrolls are sent if for single page apps/sites", () => {
@@ -72,57 +88,85 @@ describe("Browser heatmap tests, clicks", () => {
     it("Check if the clicks are send", () => {
         cy.visit("./cypress/fixtures/click_test.html");
         cy.get("#click").click(clickX, clickY);
-        // its in event queue as we are checking directly after the click
-        cy.fetch_local_event_queue(hp.appKey).then((rq) => {
-            cy.log(rq);
-            expect(rq.length).to.equal(1);
-            expect(rq[0].key).to.equal("[CLY]_action");
-            cy.check_commons(rq[0]);
-            const seg = rq[0].segmentation;
-            click_check(seg, 8, 8);
-        });
-        cy.fetch_local_request_queue(hp.appKey).then((rq) => {
-            cy.log(rq);
-            expect(rq.length).to.equal(2);
+        // There should be 3 requests: session -> event batch 1 -> event batch 2
+        hp.waitFunction(hp.getTimestampMs(), 1000, 100, () => {
+            cy.fetch_local_request_queue(hp.appKey).then((rq) => {
+                cy.log(rq);
+                expect(rq.length).to.equal(3);
+                const beginSessionReq = rq[0];
+                const eventBatch1 = JSON.parse(rq[1].events);
+                const eventBatch2 = JSON.parse(rq[2].events);
+                // 1st req
+                cy.check_session(beginSessionReq, undefined, undefined, hp.appKey);
+                // 2nd req
+                expect(eventBatch1.length).to.equal(2);
+                expect(eventBatch1[0].key).to.equal("[CLY]_orientation");
+                expect(eventBatch1[0].segmentation.mode).to.be.ok;
+                cy.check_view_event(eventBatch1[1], "/cypress/fixtures/click_test.html", undefined, false); // start view
+                // 3rd req
+                expect(eventBatch2[0].key).to.equal("[CLY]_action");
+                cy.check_commons(eventBatch2[0]);
+                const seg = eventBatch2[0].segmentation;
+                click_check(seg, 8, 8);
+            });
         });
     });
     it("Check if the DOM restriction works if non targeted child clicked", () => {
         cy.visit("./cypress/fixtures/click_test.html?dom=click2");
         // this click must be ignored as it is not click2
         cy.get("#click").click(clickX, clickY);
-        cy.fetch_local_event_queue(hp.appKey).then((rq) => {
-            cy.log(rq);
-            expect(rq.length).to.equal(0);
-        });
-        cy.fetch_local_request_queue(hp.appKey).then((rq) => {
-            cy.log(rq);
-            expect(rq.length).to.equal(2);
+        // There should be 2 requests: session -> event batch 1
+        hp.waitFunction(hp.getTimestampMs(), 1000, 100, () => {
+            cy.fetch_local_request_queue(hp.appKey).then((rq) => {
+                cy.log(rq);
+                expect(rq.length).to.equal(2);
+                const beginSessionReq = rq[0];
+                const eventBatch1 = JSON.parse(rq[1].events);
+                // 1st req
+                cy.check_session(beginSessionReq, undefined, undefined, hp.appKey);
+                // 2nd req
+                expect(eventBatch1.length).to.equal(2);
+                expect(eventBatch1[0].key).to.equal("[CLY]_orientation");
+                expect(eventBatch1[0].segmentation.mode).to.be.ok;
+                cy.check_view_event(eventBatch1[1], "/cypress/fixtures/click_test.html", undefined, false); // start view
+            });
         });
     });
     it("Check if the DOM restriction works only the child is clicked", () => {
         cy.visit("./cypress/fixtures/click_test.html?dom=click2");
         // only click2 must be perceived
-        cy.get("#click").click(clickX, clickY).wait(1000);
-        cy.get("#click2").click(clickX, clickY).wait(1000);
+        cy.get("#click").click(clickX, clickY);
+        cy.get("#click2").click(clickX, clickY);
         cy.get("#click3").click(clickX, clickY);
-        cy.fetch_local_event_queue(hp.appKey).then((rq) => {
-            cy.log(rq);
-            expect(rq.length).to.equal(0);
-        });
-        // as we waited the call is in request queue now
-        cy.fetch_local_request_queue(hp.appKey).then((rq) => {
-            cy.log(rq);
-            // first 2 is session and orientation
-            expect(rq.length).to.equal(3);
-            const clickEv = JSON.parse(rq[2].events);
-            // only single event must exist
-            expect(clickEv.length).to.equal(1);
-            expect(clickEv[0].key).to.equal("[CLY]_action");
-            cy.check_commons(clickEv[0]);
-            const seg = clickEv[0].segmentation;
-            click_check(seg, 79, 8);
+        hp.waitFunction(hp.getTimestampMs(), 1000, 100, () => {
+            // There should be 3 requests: session -> event batch 1 -> event batch 2
+            cy.fetch_local_request_queue(hp.appKey).then((rq) => {
+                cy.log(rq);
+                expect(rq.length).to.equal(3);
+                const beginSessionReq = rq[0];
+                const eventBatch1 = JSON.parse(rq[1].events);
+                const eventBatch2 = JSON.parse(rq[2].events);
+                // 1st req
+                cy.check_session(beginSessionReq, undefined, undefined, hp.appKey);
+                // 2nd req
+                expect(eventBatch1.length).to.equal(2);
+                expect(eventBatch1[0].key).to.equal("[CLY]_orientation");
+                expect(eventBatch1[0].segmentation.mode).to.be.ok;
+                cy.check_view_event(eventBatch1[1], "/cypress/fixtures/click_test.html", undefined, false); // start view
+                // 3rd req
+                expect(eventBatch2[0].key).to.equal("[CLY]_action");
+                cy.check_commons(eventBatch2[0]);
+                const seg = eventBatch2[0].segmentation;
+                click_check(seg, 80, 8);
+            });
         });
     });
 });

package/cypress/integration/integration.js ADDED Viewed

@@ -0,0 +1,60 @@
+var Countly = require("../../lib/countly");
+var hp = require("../support/helper");
+/**
+ *  init countly
+ */
+function initMain() {
+    Countly.init({
+        app_key: "YOUR_APP_KEY",
+        url: "https://try.count.ly",
+        debug: true,
+        test_mode: true
+    });
+}
+describe("Integration test", () => {
+    it("int, no consent, no offline_mode", () => {
+        initMain();
+        const idType = Countly.get_device_id_type();
+        const id = Countly.get_device_id();
+        const consentStatus = Countly.check_any_consent();
+        Countly.remove_consent();
+        Countly.disable_offline_mode();
+        Countly.add_event({ key: "test", count: 1, sum: 1, dur: 1, segmentation: { test: "test" } });
+        Countly.start_event("test");
+        Countly.cancel_event("gobbledygook");
+        Countly.end_event("test");
+        Countly.report_conversion("camp_id", "camp_user_id");
+        Countly.recordDirectAttribution("camp_id", "camp_user_id");
+        Countly.user_details({ name: "name" });
+        Countly.userData.set("set", "set");
+        Countly.userData.save();
+        Countly.report_trace({ name: "name", stz: 1, type: "type" });
+        Countly.log_error({ error: "error", stack: "stack" });
+        Countly.add_log("error");
+        Countly.fetch_remote_config();
+        Countly.enrollUserToAb();
+        const remote = Countly.get_remote_config();
+        Countly.track_sessions();
+        Countly.track_pageview();
+        Countly.track_errors();
+        Countly.track_clicks();
+        Countly.track_scrolls();
+        Countly.track_links();
+        Countly.track_forms();
+        Countly.collect_from_forms();
+        Countly.collect_from_facebook();
+        Countly.opt_in();
+        // TODO: widgets
+        // TODO: make better
+        cy.fetch_local_request_queue().then((rq) => {
+            cy.log(rq);
+            hp.testNormalFlow(rq, "/__cypress/iframes/integration%2Fintegration.js", hp.appKey);
+            expect(consentStatus).to.equal(true); // no consent necessary
+            expect(remote).to.eql({}); // deepEqual
+            expect(rq[0].device_id).to.equal(id);
+            expect(rq[0].t).to.equal(idType);
+        });
+    });
+});

package/cypress/integration/multi_instance.js ADDED Viewed

@@ -0,0 +1,25 @@
+/* eslint-disable require-jsdoc */
+var hp = require("../support/helper");
+describe("Multi instancing tests", () => {
+    it("Check if request queue has the correct info", () => {
+        cy.visit("./cypress/fixtures/multi_instance.html");
+        hp.waitFunction(hp.getTimestampMs(), 1000, 100, () => {
+            cy.fetch_local_request_queue(hp.appKey + "1").then((rq) => {
+                cy.fetch_local_request_queue(hp.appKey + "2").then((rq2) => {
+                    cy.fetch_local_request_queue(hp.appKey + "3").then((rq3) => {
+                        cy.fetch_local_request_queue(hp.appKey + "4").then((rq4) => {
+                            hp.testNormalFlow(rq, "/cypress/fixtures/multi_instance.html", hp.appKey + "1");
+                            hp.testNormalFlow(rq2, "/cypress/fixtures/multi_instance.html", hp.appKey + "2");
+                            hp.testNormalFlow(rq3, "/cypress/fixtures/multi_instance.html", hp.appKey + "3");
+                            hp.testNormalFlow(rq4, "/cypress/fixtures/multi_instance.html", hp.appKey + "4");
+                            expect(rq[0].device_id).to.not.equal(rq2[0].device_id);
+                            expect(rq3[0].device_id).to.not.equal(rq4[0].device_id);
+                            expect(rq[0].device_id).to.not.equal(rq3[0].device_id);
+                        });
+                    });
+                });
+            });
+        });
+    });
+});