Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rebase issue.

Browse Source
This commit is contained in:
cahrens
2014-07-31 16:35:59 -04:00
parent a63cc0b30f
commit 121922a316
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/static/coffee/spec/main.coffee
View File

@@ -212,7 +212,6 @@ define([
"js/spec/models/component_template_spec",
"js/spec/models/explicit_url_spec",
"js/spec/models/group_configuration_spec",
"js/spec/models/xblock_info_spec",
"js/spec/utils/drag_and_drop_spec",

26
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
View File

@@ -530,32 +530,6 @@ class TestMixedModuleStore(unittest.TestCase):
self.assertIn(self.course_locations[self.XML_COURSEID1], course_ids)
self.assertIn(self.course_locations[self.XML_COURSEID2], course_ids)
@ddt.data('draft')
def test_has_changes_draft_mongo(self, default_ms):
"""
Smoke test for has_changes with draft mongo modulestore.
Tests already exist for both split and draft in their own test files.
"""
self.initdb(default_ms)
item = self.store.create_item(
self.user_id, self.course_locations[self.MONGO_COURSEID].course_key, 'problem', block_id='orphan'
)
self.assertTrue(self.store.has_changes(item.location))
self.store.publish(item.location, self.user_id)
self.assertFalse(self.store.has_changes(item.location))
@ddt.data('split')
def test_has_changes_split(self, default_ms):
"""
Smoke test for has_changes with split modulestore.
Tests already exist for both split and draft in their own test files.
"""
self.initdb(default_ms)
self.assertTrue(self.store.has_changes(self.writable_chapter_location))
# split modulestore's "publish" method is currently called "xblock_publish"
def test_xml_get_courses(self):
"""
Test that the xml modulestore only loaded the courses from the maps.