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
51216748
Commit
51216748
authored
Dec 07, 2015
by
solashirai
Committed by
solashirai
Mar 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quality fixes
parent
9dd604ee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
openedx/tests/xblock_integration/test_crowdsource_hinter.py
+5
-5
openedx/tests/xblock_integration/test_crowdsourcehinter_problem.py
+4
-1
No files found.
openedx/tests/xblock_integration/test_crowdsource_hinter.py
View file @
51216748
...
@@ -8,17 +8,15 @@ from nose.plugins.attrib import attr
...
@@ -8,17 +8,15 @@ from nose.plugins.attrib import attr
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
xmodule.modulestore.tests.django_utils
import
ModuleStoreTestCase
from
xmodule.modulestore.tests.django_utils
import
SharedModuleStoreTestCase
from
xmodule.modulestore.tests.django_utils
import
SharedModuleStoreTestCase
from
xmodule.modulestore.tests.factories
import
CourseFactory
,
ItemFactory
from
xmodule.modulestore.tests.factories
import
CourseFactory
,
ItemFactory
from
lms.djangoapps.courseware.tests.helpers
import
LoginEnrollmentTestCase
from
lms.djangoapps.courseware.tests.helpers
import
LoginEnrollmentTestCase
from
lms.djangoapps.courseware.tests.factories
import
GlobalStaffFactory
from
lms.djangoapps.courseware.tests.factories
import
GlobalStaffFactory
from
lms.djangoapps.lms_xblock.runtime
import
quote_slashes
from
lms.djangoapps.lms_xblock.runtime
import
quote_slashes
from
django.conf
import
settings
from
django.conf
import
settings
from
django.core.urlresolvers
import
reverse
class
TestCrowdsourceHinter
(
SharedModuleStoreTestCase
,
LoginEnrollmentTestCase
):
class
TestCrowdsourceHinter
(
SharedModuleStoreTestCase
,
LoginEnrollmentTestCase
):
"""
"""
...
@@ -84,7 +82,8 @@ class TestCrowdsourceHinter(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
...
@@ -84,7 +82,8 @@ class TestCrowdsourceHinter(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
xblock_name
=
TestCrowdsourceHinter
.
XBLOCK_NAMES
[
0
]
xblock_name
=
TestCrowdsourceHinter
.
XBLOCK_NAMES
[
0
]
return
reverse
(
'xblock_handler'
,
kwargs
=
{
return
reverse
(
'xblock_handler'
,
kwargs
=
{
'course_id'
:
self
.
course
.
id
.
to_deprecated_string
(),
'course_id'
:
self
.
course
.
id
.
to_deprecated_string
(),
'usage_id'
:
quote_slashes
(
self
.
course
.
id
.
make_usage_key
(
'crowdsourcehinter'
,
xblock_name
)
.
to_deprecated_string
()),
'usage_id'
:
quote_slashes
(
self
.
course
.
id
.
make_usage_key
(
'crowdsourcehinter'
,
xblock_name
)
.
to_deprecated_string
()),
'handler'
:
handler
,
'handler'
:
handler
,
'suffix'
:
''
'suffix'
:
''
})
})
...
@@ -137,6 +136,7 @@ class TestCrowdsourceHinter(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
...
@@ -137,6 +136,7 @@ class TestCrowdsourceHinter(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
self
.
assertEqual
(
resp
[
resp_key
],
resp_val
)
self
.
assertEqual
(
resp
[
resp_key
],
resp_val
)
self
.
assert_request_status_code
(
200
,
self
.
course_url
)
self
.
assert_request_status_code
(
200
,
self
.
course_url
)
@attr
(
'shard_1'
)
@attr
(
'shard_1'
)
class
TestHinterFunctions
(
TestCrowdsourceHinter
):
class
TestHinterFunctions
(
TestCrowdsourceHinter
):
"""
"""
...
@@ -161,7 +161,7 @@ class TestHinterFunctions(TestCrowdsourceHinter):
...
@@ -161,7 +161,7 @@ class TestHinterFunctions(TestCrowdsourceHinter):
data
=
{
'new_hint_submission'
:
'new hint for answer 1'
,
'answer'
:
'incorrect answer 1'
}
data
=
{
'new_hint_submission'
:
'new hint for answer 1'
,
'answer'
:
'incorrect answer 1'
}
self
.
call_event
(
'get_hint'
,
{
'submittedanswer'
:
'ans=incorrect+answer+1'
})
self
.
call_event
(
'get_hint'
,
{
'submittedanswer'
:
'ans=incorrect+answer+1'
})
result
=
self
.
call_event
(
'add_new_hint'
,
data
)
result
=
self
.
call_event
(
'add_new_hint'
,
data
)
expected
=
{
'success'
:
True
,
expected
=
{
'success'
:
True
,
'result'
:
'Hint added'
}
'result'
:
'Hint added'
}
self
.
assertEqual
(
json
.
loads
(
result
.
content
),
expected
)
self
.
assertEqual
(
json
.
loads
(
result
.
content
),
expected
)
...
...
openedx/tests/xblock_integration/test_crowdsourcehinter_problem.py
View file @
51216748
...
@@ -4,7 +4,7 @@ Javascript tests for the crowdsourcehinter xblock
...
@@ -4,7 +4,7 @@ Javascript tests for the crowdsourcehinter xblock
from
textwrap
import
dedent
from
textwrap
import
dedent
from
common.test.acceptance.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
common.test.acceptance.fixtures.course
import
CourseFixture
,
XBlockFixtureDesc
from
common.test.acceptance.pages.lms.courseware
import
CoursewarePage
from
common.test.acceptance.pages.lms.courseware
import
CoursewarePage
from
openedx.tests.xblock_integration.
pages.crowdsourcehinter_problem
import
CrowdsourcehinterProblemPage
from
pages.crowdsourcehinter_problem
import
CrowdsourcehinterProblemPage
from
common.test.acceptance.pages.studio.auto_auth
import
AutoAuthPage
from
common.test.acceptance.pages.studio.auto_auth
import
AutoAuthPage
from
common.test.acceptance.tests.helpers
import
UniqueCourseTest
from
common.test.acceptance.tests.helpers
import
UniqueCourseTest
...
@@ -59,6 +59,9 @@ class CrowdsourcehinterProblemTest(UniqueCourseTest):
...
@@ -59,6 +59,9 @@ class CrowdsourcehinterProblemTest(UniqueCourseTest):
course_id
=
self
.
course_id
,
staff
=
False
)
.
visit
()
course_id
=
self
.
course_id
,
staff
=
False
)
.
visit
()
def
_goto_csh_problem_page
(
self
):
def
_goto_csh_problem_page
(
self
):
"""
Visit the page courseware page containing the hinter
"""
self
.
courseware_page
.
visit
()
self
.
courseware_page
.
visit
()
csh_problem_page
=
CrowdsourcehinterProblemPage
(
self
.
browser
)
csh_problem_page
=
CrowdsourcehinterProblemPage
(
self
.
browser
)
self
.
assertGreater
(
len
(
self
.
browser
.
find_elements_by_class_name
(
'crowdsourcehinter_block'
)),
0
)
self
.
assertGreater
(
len
(
self
.
browser
.
find_elements_by_class_name
(
'crowdsourcehinter_block'
)),
0
)
...
...
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