Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
c9d7e17a
Commit
c9d7e17a
authored
Jun 14, 2014
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failures due to previous commit
parent
4273e197
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
converse.js
converse.js
+1
-1
spec/converse.js
spec/converse.js
+2
-2
tests/main.js
tests/main.js
+1
-1
tests/mock.js
tests/mock.js
+1
-0
No files found.
converse.js
View file @
c9d7e17a
...
@@ -2706,7 +2706,7 @@
...
@@ -2706,7 +2706,7 @@
var
id
=
b64_sha1
(
'
converse.minchatstoggle
'
+
this
.
bare_jid
);
var
id
=
b64_sha1
(
'
converse.minchatstoggle
'
+
this
.
bare_jid
);
this
.
toggleview
.
model
.
id
=
id
;
// Appears to be necessary for backbone.localStorage
this
.
toggleview
.
model
.
id
=
id
;
// Appears to be necessary for backbone.localStorage
this
.
toggleview
.
model
.
localStorage
=
new
Backbone
.
LocalStorage
(
id
);
this
.
toggleview
.
model
.
localStorage
=
new
Backbone
.
LocalStorage
(
id
);
this
.
toggleview
.
model
.
fetch
(
{
success
:
callback
,
error
:
callback
}
);
this
.
toggleview
.
model
.
fetch
();
},
},
render
:
function
()
{
render
:
function
()
{
...
...
spec/converse.js
View file @
c9d7e17a
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
it
(
"
has an API method for retrieving the next RID
"
,
$
.
proxy
(
function
()
{
it
(
"
has an API method for retrieving the next RID
"
,
$
.
proxy
(
function
()
{
var
old_connection
=
converse
.
connection
;
var
old_connection
=
converse
.
connection
;
converse
.
connection
.
rid
=
'
1234
'
;
converse
.
connection
.
_proto
.
rid
=
'
1234
'
;
converse
.
expose_rid_and_sid
=
false
;
converse
.
expose_rid_and_sid
=
false
;
expect
(
converse_api
.
getRID
()).
toBe
(
null
);
expect
(
converse_api
.
getRID
()).
toBe
(
null
);
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
it
(
"
has an API method for retrieving the SID
"
,
$
.
proxy
(
function
()
{
it
(
"
has an API method for retrieving the SID
"
,
$
.
proxy
(
function
()
{
var
old_connection
=
converse
.
connection
;
var
old_connection
=
converse
.
connection
;
converse
.
connection
.
sid
=
'
1234
'
;
converse
.
connection
.
_proto
.
sid
=
'
1234
'
;
converse
.
expose_rid_and_sid
=
false
;
converse
.
expose_rid_and_sid
=
false
;
expect
(
converse_api
.
getSID
()).
toBe
(
null
);
expect
(
converse_api
.
getSID
()).
toBe
(
null
);
...
...
tests/main.js
View file @
c9d7e17a
...
@@ -69,7 +69,7 @@ require([
...
@@ -69,7 +69,7 @@ require([
delete
converse
.
callback
;
delete
converse
.
callback
;
// Stub the trimChat method. It causes havoc when running with
// Stub the trimChat method. It causes havoc when running with
// phantomJS.
// phantomJS.
converse
.
ChatBoxView
.
prototype
.
trimChat
=
function
()
{};
converse
.
ChatBoxView
s
.
prototype
.
trimChat
=
function
()
{};
// Jasmine stuff
// Jasmine stuff
var
jasmineEnv
=
jasmine
.
getEnv
();
var
jasmineEnv
=
jasmine
.
getEnv
();
...
...
tests/mock.js
View file @
c9d7e17a
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
};
};
mock
.
mock_connection
=
{
mock
.
mock_connection
=
{
'
_proto
'
:
{},
'
mock
'
:
true
,
'
mock
'
:
true
,
'
muc
'
:
{
'
muc
'
:
{
'
listRooms
'
:
function
()
{},
'
listRooms
'
:
function
()
{},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment