Skip to content

Commit 27ae441

Browse files
authored
Merge branch 'next' into ar2rsawseen/next
2 parents 436cb4a + 0233707 commit 27ae441

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,3 +410,13 @@ jobs:
410410
npm install
411411
xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
412412
npm run cy:run:sdk
413+
414+
- name: Upload UI tests artifacts
415+
if: ${{ failure() }}
416+
shell: bash
417+
working-directory: /opt/countly/ui-tests/cypress
418+
run: |
419+
ARTIFACT_ARCHIVE_NAME="$(date '+%Y%m%d-%H.%M')_${GITHUB_REPOSITORY#*/}_CI#${{ github.run_number }}_ui_test_sdk.tar.gz"
420+
mkdir -p screenshots videos
421+
tar zcvf "$ARTIFACT_ARCHIVE_NAME" screenshots videos
422+
curl -o /tmp/uploader.log -u "${{ secrets.BOX_UPLOAD_AUTH }}" ${{ secrets.BOX_UPLOAD_PATH }} -T "$ARTIFACT_ARCHIVE_NAME"

frontend/express/public/javascripts/countly/vue/core.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -894,11 +894,6 @@
894894
self.vm = new Vue({
895895
el: el,
896896
store: _vuex.getGlobalStore(),
897-
mixins: [
898-
countlyVue.container.dataMixin({
899-
"customOverlayComponents": "/overlay/custom",
900-
})
901-
],
902897
components: {
903898
DummyCompAPI: DummyCompAPI,
904899
MainView: self.component,
@@ -910,7 +905,6 @@
910905
<GenericPopups></GenericPopups>\
911906
<DummyCompAPI></DummyCompAPI>\
912907
<QuickstartPopover></QuickstartPopover>\
913-
<component v-if="customOverlayComponents" v-for="customComponent in customOverlayComponents" :key="customComponent.name" :is="customComponent.component" />\
914908
</div>',
915909
beforeCreate: function() {
916910
this.$route.params = self.params;

ui-tests/cypress/e2e/sdk/tool_02.cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ describe('2.Warning tooltip (old Web SDK version)', () => {
1616
goToConfigTab(true);
1717
checkTooltipAppears('warning');
1818
});
19-
});
19+
});

0 commit comments

Comments
 (0)