فهرست منبع

test: try fixing tests due to initialisation logic

Co-authored-by: Junie <junie@jetbrains.com>
rugk 2 ماه پیش
والد
کامیت
4b52ac5c23
2فایلهای تغییر یافته به همراه19 افزوده شده و 2 حذف شده
  1. 10 1
      js/test/CopyToClipboard.js
  2. 9 1
      js/test/DiscussionViewer.js

+ 10 - 1
js/test/CopyToClipboard.js

@@ -16,6 +16,8 @@ describe('CopyToClipboard', function () {
                     common.enableClipboard();
 
                     document.body.innerHTML = (
+                        '<div id="status" class="hidden"></div>' +
+                        '<div id="errormessage" class="hidden"></div>' +
                         '<div id="placeholder" class="hidden">+++ no document text ' +
                         '+++</div><div id="prettymessage" class="hidden">' +
                         '<button type="button" id="prettyMessageCopyBtn"><svg id="copyIcon"></svg>' +
@@ -24,6 +26,7 @@ describe('CopyToClipboard', function () {
                         '</div><div id="plaintext" class="hidden"></div>'
                     );
 
+                    PrivateBin.Alert.init();
                     PrivateBin.PasteViewer.init();
                     PrivateBin.PasteViewer.setFormat(format);
                     PrivateBin.PasteViewer.setText(text);
@@ -52,6 +55,8 @@ describe('CopyToClipboard', function () {
                     common.enableClipboard();
 
                     document.body.innerHTML = (
+                        '<div id="status" class="hidden"></div>' +
+                        '<div id="errormessage" class="hidden"></div>' +
                         '<div id="placeholder">+++ no document text ' +
                         '+++</div><div id="prettymessage" class="hidden">' +
                         '<button type="button" id="prettyMessageCopyBtn"><svg id="copyIcon"></svg>' +
@@ -106,7 +111,11 @@ describe('CopyToClipboard', function () {
             async function (text) {
                 common.enableClipboard();
 
-                document.body.innerHTML = '<button id="copyLink"></button>';
+                document.body.innerHTML = (
+                    '<div id="status" class="hidden"></div>' +
+                    '<div id="errormessage" class="hidden"></div>' +
+                    '<button id="copyLink"></button>'
+                );
 
                 PrivateBin.Alert.init();
                 PrivateBin.CopyToClipboard.init();

+ 9 - 1
js/test/DiscussionViewer.js

@@ -29,7 +29,11 @@ describe('DiscussionViewer', function () {
                 function (comments, commentKey, fadeOut, nickname, message, alertType, alert) {
                     var clean = globalThis.cleanup(),
                         results = [];
+                    PrivateBin.Model.reset();
+                    PrivateBin.Helper.reset();
                     document.body.innerHTML = (
+                        '<div id="status" class="hidden"></div>' +
+                        '<div id="errormessage" class="hidden"></div>' +
                         `<div id="discussion">
 	<h4>Discussion</h4>
 	<div id="commentcontainer"></div>
@@ -60,6 +64,7 @@ describe('DiscussionViewer', function () {
 `
                     );
                     PrivateBin.Model.init();
+                    PrivateBin.Alert.init();
                     PrivateBin.DiscussionViewer.init();
                     results.push(
                         !document.getElementById('discussion').classList.contains('hidden')
@@ -71,7 +76,9 @@ describe('DiscussionViewer', function () {
                     comments.forEach(function (comment) {
                         comment.id = comment.idArray.join('');
                         comment.parentid = comment.parentidArray.join('');
-                        PrivateBin.DiscussionViewer.addComment(PrivateBin.Helper.CommentFactory(comment), comment.data, comment.meta.nickname);
+                        comment.getCreated = function() { return comment.meta.postdate; };
+                        comment.getIcon = function() { return comment.meta.vizhash; };
+                        PrivateBin.DiscussionViewer.addComment(comment, comment.data, comment.meta.nickname);
                     });
                     results.push(
                         document.getElementById('discussion').classList.contains('hidden')
@@ -93,6 +100,7 @@ describe('DiscussionViewer', function () {
                     // clicking "Add comment" button should open the reply form
                     document.getElementById('commentcontainer').querySelector('button').click();
                     results.push(
+                        document.getElementById('reply') !== null &&
                         !document.getElementById('reply').classList.contains('hidden')
                     );
                     document.querySelector('#reply #nickname').value = nickname;