Commit 7b4fe902 authored by JC Brand's avatar JC Brand

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

parent 2d846961
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<link rel="stylesheet" type="text/css" href="../components/jasmine/src/html/jasmine.css"> <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/theme.css" />
<link type="text/css" rel="stylesheet" media="screen" href="../css/converse.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> </head>
<body> <body>
......
// Extra test dependencies // Extra test dependencies
config.baseUrl = '../';
config.paths.mock = "tests/mock"; config.paths.mock = "tests/mock";
config.paths.test_utils = "tests/utils"; config.paths.test_utils = "tests/utils";
config.paths.jasmine = "components/jasmine/lib/jasmine-core/jasmine"; config.paths.jasmine = "components/jasmine/lib/jasmine-core/jasmine";
......
...@@ -38,7 +38,27 @@ ...@@ -38,7 +38,27 @@
view.onChatRoomMessage(message.nodeTree); 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 contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@localhost';
var chatbox = test_utils.openChatBoxFor(contact_jid); var chatbox = test_utils.openChatBoxFor(contact_jid);
var view = converse.chatboxviews.get(contact_jid); var view = converse.chatboxviews.get(contact_jid);
...@@ -54,11 +74,6 @@ ...@@ -54,11 +74,6 @@
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree(); .c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
converse.chatboxes.onMessage(msg); converse.chatboxes.onMessage(msg);
}); });
it("Show the control box", function () {
test_utils.openControlBox();
test_utils.openContactsPanel();
});
}); });
}, window, mock, test_utils)); }, window, mock, test_utils));
})); }));
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment