Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
ac977ba4
Commit
ac977ba4
authored
Jun 23, 2016
by
Andy Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add back and fix missing discussion Jasmine tests
parent
11fa2f37
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
common/static/common/js/discussion/discussion.js
+2
-2
common/static/common/js/discussion/utils.js
+2
-2
common/static/karma_common.conf.js
+5
-1
No files found.
common/static/common/js/discussion/discussion.js
View file @
ac977ba4
...
...
@@ -82,10 +82,10 @@
Discussion
.
prototype
.
retrieveAnotherPage
=
function
(
mode
,
options
,
sort_options
,
error
)
{
var
data
,
url
,
self
=
this
;
if
(
options
===
null
)
{
if
(
!
options
)
{
options
=
{};
}
if
(
sort_options
===
null
)
{
if
(
!
sort_options
)
{
sort_options
=
{};
}
data
=
{
...
...
common/static/common/js/discussion/utils.js
View file @
ac977ba4
...
...
@@ -30,7 +30,7 @@
DiscussionUtil
.
isStaff
=
function
(
userId
)
{
var
staff
;
if
(
userId
===
null
)
{
if
(
_
.
isUndefined
(
userId
)
)
{
userId
=
this
.
user
?
this
.
user
.
id
:
void
0
;
}
staff
=
_
.
union
(
this
.
roleIds
.
Moderator
,
this
.
roleIds
.
Administrator
);
...
...
@@ -39,7 +39,7 @@
DiscussionUtil
.
isTA
=
function
(
userId
)
{
var
ta
;
if
(
userId
===
null
)
{
if
(
_
.
isUndefined
(
userId
)
)
{
userId
=
this
.
user
?
this
.
user
.
id
:
void
0
;
}
ta
=
_
.
union
(
this
.
roleIds
[
'Community TA'
]);
...
...
common/static/karma_common.conf.js
View file @
ac977ba4
...
...
@@ -41,7 +41,9 @@ var options = {
{
pattern
:
'js/vendor/jasmine-imagediff.js'
,
included
:
true
},
{
pattern
:
'common/js/spec_helpers/jasmine-extensions.js'
,
included
:
true
},
{
pattern
:
'common/js/spec_helpers/jasmine-waituntil.js'
,
included
:
true
}
{
pattern
:
'common/js/spec_helpers/jasmine-waituntil.js'
,
included
:
true
},
{
pattern
:
'common/js/spec_helpers/discussion_spec_helper.js'
,
included
:
true
},
{
pattern
:
'common/js/spec/discussion/view/discussion_view_spec_helper.js'
,
included
:
true
}
],
libraryFiles
:
[
...
...
@@ -53,6 +55,7 @@ var options = {
{
pattern
:
'coffee/src/**/*.js'
,
included
:
true
},
{
pattern
:
'common/js/xblock/core.js'
,
included
:
true
},
{
pattern
:
'common/js/xblock/runtime.v1.js'
,
included
:
true
},
{
pattern
:
'common/js/discussion/**/*.js'
,
included
:
true
},
{
pattern
:
'js/capa/src/**/*.js'
,
included
:
true
},
{
pattern
:
'js/src/**/*.js'
,
included
:
true
}
],
...
...
@@ -60,6 +63,7 @@ var options = {
specFiles
:
[
{
pattern
:
'coffee/spec/**/*.js'
,
included
:
true
},
{
pattern
:
'common/js/spec/xblock/*.js'
,
included
:
true
},
{
pattern
:
'common/js/spec/discussion/**/*spec.js'
,
included
:
true
},
{
pattern
:
'js/**/*spec.js'
,
included
:
true
}
],
...
...
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