Fix the live mockup again (and move to mockup.html)

7b4fe902 · JC Brand · 2d846961 · 7b4fe902 · 7b4fe902 · 7b4fe902
Commit 7b4fe902 authored Mar 21, 2016 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 9 deletions

mockup.html mockup.html +2 -2

mockup/main.js mockup/main.js +0 -1

mockup/mockup.js mockup/mockup.js +21 -6

No files found.
--- a/mockup/index.html
+++ b/mockup/index.html
@@ -7,8 +7,8 @@
    <link rel="stylesheet" type="text/css" href="../components/jasmine/src/html/jasmine.css">
    <link type="text/css" rel="stylesheet" media="screen" href="../css/theme.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="../css/converse.css" />
-    <script src="../main.js"></script>
+    <script src="converse.js"></script>
-    <script data-main="main" src="../components/requirejs/require.js"></script>
+    <script data-main="mockup/main" src="components/requirejs/require.js"></script>
 </head>
 <body>

--- a/mockup/main.js
+++ b/mockup/main.js
 // Extra test dependencies
-config.baseUrl = '../';
 config.paths.mock = "tests/mock";
 config.paths.test_utils = "tests/utils";
 config.paths.jasmine = "components/jasmine/lib/jasmine-core/jasmine";

--- a/mockup/mockup.js
+++ b/mockup/mockup.js
@@ -38,7 +38,27 @@
                view.onChatRoomMessage(message.nodeTree);
            });
-            it("Show a private chat box", function () {
+            it("Show the control box", function () {
+                test_utils.openControlBox();
+                test_utils.openContactsPanel();
+            });
+            it("Show a headlines box", function () {
+                converse.connection._dataRecv(
+                    test_utils.createRequest(
+                        $msg({
+                            'type': 'headline',
+                            'from': 'notify.example.com',
+                            'to': 'dummy@localhost',
+                            'xml:lang': 'en'
+                        })
+                        .c('subject').t('MAIL').up()
+                        .c('body').t('You got mail.').up()
+                    )
+                );
+            });
+            xit("Show a private chat box", function () {
                var contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@localhost';
                var chatbox = test_utils.openChatBoxFor(contact_jid);
                var view = converse.chatboxviews.get(contact_jid);
@@ -54,11 +74,6 @@
                        .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
                converse.chatboxes.onMessage(msg);
            });
-            it("Show the control box", function () {
-                test_utils.openControlBox();
-                test_utils.openContactsPanel();
-            });
        });
    }, window, mock, test_utils));
 }));