Commit Graph

234 Commits

Author SHA1 Message Date
Christina Roberts
166aea62bb Merge pull request #341 from edx/talbs/studio-authorship
Studio: Authorship Rights Request UI + Dashboard Clean-up
2013-07-26 03:59:07 -07:00
Sarina Canelake
50d35b30b1 Fix failing acceptance test 2013-07-25 14:56:22 -04:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
Adam Palay
2efcb0cdca Change default names for various LMS components
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
2013-07-25 10:38:47 -04:00
Peter Fogg
6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories
Peter fogg/notification stories
2013-07-23 09:05:10 -07:00
Peter Fogg
d87dba9e04 Correctly persist checklist settings.
Incidentally, fixes an acceptance test (which would have caught this
bug) not running. Its step regex was "They are correctly selected
after I reload the page$", which happens to be matched by "I reload
the page$", another step definition. Lettuce seems to arbitrarily pick
between definitions if they both match a step, so it's good to ensure
that each step isn't a sub-regexes of another.
2013-07-22 15:10:59 -04:00
cahrens
6629d5d3a3 Merge branch 'master' into talbs/studio-authorship
Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html
2013-07-22 12:15:42 -04:00
Peter Fogg
fb0fcc310b Factor out common code between module editing and course overview. 2013-07-22 11:37:09 -04:00
Peter Fogg
75edc65748 Use Backbone notifications for setting graded status. 2013-07-22 11:37:09 -04:00
Peter Fogg
5029f460ec Use Backbone notifications for component delete. 2013-07-22 11:37:08 -04:00
Peter Fogg
9fe4cb734c Use Backbone notifications for course section delete. 2013-07-22 11:37:08 -04:00
Will Daly
76a63a6ef0 Disabled test failing due to bug in Studio 2013-07-19 17:13:51 -04:00
Will Daly
17daa2a023 Fixed two other tests 2013-07-19 16:49:16 -04:00
Will Daly
27d51b3453 Attempt to fix video test 2013-07-19 16:49:15 -04:00
Calen Pennington
8b5979641b Change default rerandomize and showanswer
The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
2013-07-16 14:33:58 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions.
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
2013-07-16 14:24:41 -04:00
cahrens
923ba365b1 Merge branch 'master' into talbs/studio-authorship 2013-07-12 13:35:52 -04:00
cahrens
08a1055cba Updates to index page text. 2013-07-12 13:35:27 -04:00
JonahStanley
940113efee Fixed long lines 2013-07-12 10:32:49 -04:00
JonahStanley
484e217de3 Fixed some errors 2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507 Scenario Dictionary now holds objects 2013-07-12 10:32:48 -04:00
JonahStanley
8110307ba9 CMS now refactored to use world dictionary 2013-07-12 10:32:48 -04:00
JonahStanley
35094a968b Beginnings of refactoring the acceptance tests 2013-07-12 10:32:45 -04:00
JonahStanley
d1661fa6aa Refactored recently merged in tests 2013-07-12 09:28:51 -04:00
JonahStanley
ebc9fa9e2a Made a retry_on_exception world function that will retry the given function 2013-07-12 09:28:50 -04:00
JonahStanley
1ae86673f3 Changed a world.browser.find_by_css to world.css_find 2013-07-12 09:28:50 -04:00
JonahStanley
c53aac4596 CMS acceptance tests now should not get stale element exception errors 2013-07-12 09:28:50 -04:00
JonahStanley
8b0e7c5782 Made a new command css_has_class that will safely check the class and get around stale elements 2013-07-12 09:28:49 -04:00
JonahStanley
d86502bdc1 Added in a retry for checking the class of the video 2013-07-12 09:28:49 -04:00
Peter Fogg
871ab87bf2 Fix saving notification CSS. 2013-07-12 09:01:03 -04:00
Peter Fogg
5b4524d75e Merge pull request #301 from edx/peter-fogg/explicit-course-settings
Peter fogg/explicit course settings
2013-07-11 14:09:07 -07:00
Peter Fogg
42ff1c2237 Merge pull request #366 from edx/peter-fogg/stud-116
Use new feedback notification when changing section release dates.
2013-07-11 13:34:07 -07:00
Peter Fogg
6e94960488 Fix many validation bugs and failing tests. 2013-07-11 16:09:59 -04:00
JonahStanley
24ab36c87a Unskip Acceptance Tests 2013-07-11 11:33:40 -04:00
Peter Fogg
d9716a7249 Update acceptance tests for course settings. 2013-07-11 09:11:59 -04:00
Peter Fogg
eba1bd0972 Refactor and update acceptance tests around saving settings. 2013-07-11 09:11:59 -04:00
Peter Fogg
9094f1890b Change course settings to require explicit save.
Rather than asynchronously saving when a setting is updated, we now
prompt the user to confirm their changes and only persist the data if
they hit the save button. Lettuce tests are updated to expect this
behavior and some new ones are added.
2013-07-11 09:11:07 -04:00
Jonah Stanley
786f422ffa Merge pull request #298 from edx/jonahstanley/acceptance-tests-unique-database
Jonahstanley/acceptance tests unique database
2013-07-10 14:09:28 -07:00
Peter Fogg
66b73c861f Use new feedback notification when changing section release dates. 2013-07-10 16:07:25 -04:00
David Baumgold
437e658f98 pylint fixes 2013-07-09 19:16:44 -04:00
David Baumgold
c68895ca5d world.css_click no longer returns a boolean 2013-07-09 19:16:43 -04:00
David Baumgold
7506562f50 Another lettuce test, and fixes to make it work 2013-07-09 19:16:11 -04:00
David Baumgold
b97f5585b9 Re-added a missing import 2013-07-09 19:16:10 -04:00
David Baumgold
a90590a442 Remove unused imports/constants 2013-07-09 19:16:10 -04:00
David Baumgold
2a92a14054 Wrote simple lettuce tests for pdf textbooks 2013-07-09 19:16:09 -04:00
JonahStanley
0bd1e78e03 Acceptance tests use random ports 2013-07-09 12:18:30 -04:00
Will Daly
7085b95bc0 Disabled video test that was failing on Mac OS X 2013-07-08 10:51:31 -04:00
Will Daly
01eb93eb47 Disabled tests that are failing in Jenkins 2013-07-08 10:02:01 -04:00
JonahStanley
7fabac9a4b Skipped Flakey Tests for now 2013-07-03 13:31:13 -04:00