Christopher Allan Webber
b9f097a6f9
Indenting some sections between if / else blocks in root.html
2011-06-21 23:25:15 -05:00
Christopher Allan Webber
3208bea54c
Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'
2011-06-21 23:22:16 -05:00
Christopher Allan Webber
29f1333e72
Extra checks so that we don't even RUN tests unless the right celery environ set
2011-06-21 17:02:49 -05:00
Christopher Allan Webber
cfd2cbf3dd
Make sure we *ONLY* ever kill the test database, EVER.
2011-06-21 16:04:44 -05:00
Jef van Schendel
3efb084809
Merge remote-tracking branch 'gitorious/master'
2011-06-21 19:13:07 +02:00
Christopher Allan Webber
4fd18da0a8
Also fix clean_html so that it doesn't barf on an empty string.
2011-06-21 08:20:05 -05:00
Jef van Schendel
4e5a55787b
Merge remote-tracking branch 'gitorious/master'
2011-06-21 11:22:31 +02:00
cfdv
0472653ee4
assigns migration steps to User database objects
...
adds the migration_handler to the User db class, connecting the
migration steps in ../db/migrations.py to the migration code in
gmg_commands
2011-06-20 22:48:25 -05:00
Christopher Allan Webber
a2c37d0a78
Only migrate to description_html if description also exists.
2011-06-20 21:02:46 -05:00
Christopher Allan Webber
8268884653
Fix cleaned_markdown_conversion so that it doesn't bork on empty strings
...
Basically, clean_html would throw an error on '', so we just return ''
"if not text"
2011-06-20 21:01:05 -05:00
cfdv
17bb7c388b
removes unecessary dependence on existence of username for User migration01, + fix whitespace issues
2011-06-20 19:28:02 -05:00
cfdv
e36ecab093
adds accommmodations for migration of fields in User: bio and url
2011-06-20 13:07:15 -05:00
cfdv
78c0744077
Merge remote-tracking branch 'origin/master' into is315
2011-06-20 12:50:44 -05:00
Jef van Schendel
2d1f91cc41
Merge remote-tracking branch 'gitorious/master'
2011-06-20 16:33:14 +02:00
Christopher Allan Webber
5c441e75eb
Also moving the test_server.ini to test_paste.ini to avoid ambiguity.
2011-06-20 08:57:58 -05:00
Christopher Allan Webber
a01d04a017
Provide a migration to add description_html to MediaEntries that don't have it
2011-06-19 20:42:48 -05:00
Christopher Allan Webber
4bf8e8888c
Adds util.cleaned_markdown_conversion() and uses it in the submission process
...
This simplifies the markdown processing & html cleaning of descritions
and etc by providing a wrapper function that we can use in multiple
locations.
2011-06-19 20:41:40 -05:00
Christopher Allan Webber
0692c01e4c
Merge remote branch 'remotes/jwandborg/issue_363'
...
Conflicts:
setup.py
2011-06-19 20:00:35 -05:00
Christopher Allan Webber
0798684894
Merge remote branch 'remotes/cmoylan/test_auth_views_364'
2011-06-19 19:56:25 -05:00
cfdv
0e66e6a6c6
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
2011-06-19 17:39:32 -05:00
cfdv
cd95cb6d3d
Merge remote-tracking branch 'origin/master' into is315
2011-06-19 17:20:23 -05:00
Elrond
3efdd97c2e
Move InvalidId to db.util
...
Instead of import InvalidId from the low level bson module,
first import it in our db.util wrapper and second import it
from pymongo.errors.
2011-06-20 00:09:40 +02:00
Christopher Allan Webber
eaca78748c
Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again.
...
Basically, if we don't do this celery sets itself up before it should
and improperly. :\
2011-06-19 16:43:23 -05:00
Christopher Allan Webber
68bf5b1942
Documenting the setup_globals function.
2011-06-19 16:24:31 -05:00
Christopher Allan Webber
218b8124ca
Document our new global objects added during the configobj branch
2011-06-19 16:23:17 -05:00
Christopher Allan Webber
d802498a2c
Merge remote branch 'remotes/elrond/idea/globals_check'
...
Conflicts:
mediagoblin/tests/test_globals.py
2011-06-19 16:22:41 -05:00
Christopher Allan Webber
668e8c26ad
Reset the globals parameters while testing parameters
...
(This way we can be sure that the database is torn down if necessary
but this was the only test that passed last.)
2011-06-19 16:03:13 -05:00
Christopher Allan Webber
78e1c5f1ed
Actually we need pkg_resources again in test_celery_setup :)
...
This got removed in master at the same time that it got used in the
configobj branch...
2011-06-19 13:00:49 -05:00
Christopher Allan Webber
fa4e6b279b
Merge branch 'configobj'
2011-06-19 12:59:19 -05:00
Chris Moylan
12c231c8ac
added test coverage for redirecting after login with the next param
2011-06-19 12:28:53 -05:00
Christopher Allan Webber
07f35dad60
Removing a couple of unused imports from util.py
2011-06-19 11:41:48 -05:00
Christopher Allan Webber
a32f17c969
Removing "paste config" phrasing where we're no longer using paste's config
2011-06-19 11:39:35 -05:00
Christopher Allan Webber
3c7d11ff28
renaming storage_system_from_paste_config()->storage_system_from_config()
...
As Elrond points out, this name doesn't make sense anymore since this
isn't based on the paste config. Thanks Elrond!
2011-06-19 11:36:52 -05:00
Christopher Allan Webber
0a7805f913
util.read_config_file() no longer needed; removing.
2011-06-19 11:10:45 -05:00
Chris Moylan
0a4cecdc66
Added tests for all sorts of login form abuse.
...
Added tests for log out
2011-06-19 00:22:47 -05:00
cfdv
699b547580
enables primitive display of profile data on user page
2011-06-18 22:24:32 -05:00
cfdv
0bf340727e
enables entering user details including website url and bio
...
fixes usage of objects. still need to display the data on user page
2011-06-18 21:30:56 -05:00
Christopher Allan Webber
8abeaf2fb6
Preparing celery unit tests for new setup.
...
Instead of the previous passing in of dictionaries, we're actually
checking some example config files.
2011-06-18 20:15:46 -05:00
Christopher Allan Webber
72c3ae046a
./bin/gmg commands upgraded to work with the new setup.
2011-06-18 20:14:51 -05:00
Christopher Allan Webber
623bee73b1
Nosetests should now be able to run using the new configobj / app init setup
...
Lots of changes:
- CELERY_CONFIG_FILE does not need to be set to the from_tests module
to run tests anymore, in fact it *should not be set at all* and is
specifically forbidden.
- moved around the configuration to the new 2-file format
- and generally adjusting the code appropriately.
2011-06-18 20:14:33 -05:00
Christopher Allan Webber
908d045939
Only kill the database if it's really set up.
2011-06-18 20:02:59 -05:00
Christopher Allan Webber
becb77ee8c
It's a good idea for us to pass the application itself into mg_globals :)
2011-06-18 19:00:01 -05:00
Christopher Allan Webber
924c586b72
Updating celery_setup.from_celery to use new config loading / app init
...
- The code for this is significantly simpler now. The app sets up
everything but celery, and from_celery finishes the job.
- There's no more specifying the mediagoblin section in the file,
which doesn't make sense anymore and was already confusing.
2011-06-18 18:59:42 -05:00
Jef van Schendel
76e21adbd8
Merge remote-tracking branch 'gitorious/master'
2011-06-19 01:44:26 +02:00
Christopher Allan Webber
52f20ff337
Removing option to set celery config section.
...
There's no real reason to support setting the celery config section;
so we'll just make it always ['celery'].
2011-06-18 18:31:56 -05:00
Christopher Allan Webber
d01744dd75
Removing type conversions from setup_celery_from_config.
...
These simply aren't needed any more, not now that the config validator
stuff does type conversion for us.
Also fixed the docstring to explain force_celery_always_eager.
2011-06-18 18:30:14 -05:00
Christopher Allan Webber
3f5cf663c0
Move entire app structure over to using the new config system.
...
This is a huge change! This means several things.
- From the python point of view, launching the application is a heck
of a lot cleaner. You just need to pass in the config file path to
MediaGoblinApp's __init__() and whether or not this funtion should
setup celery and you're good.
- There are now two separate config files, separating the server
setup from the application setup.
- server.ini: the paste deploy config file, which configures the
applications and server setup but *NOT* the mediagoblin application
itself.
- mediagoblin.ini: where you configure mediagoblin (and possibly celery)
- Launching the application is now different. Instead of:
./bin/paster serve mediagoblin.ini --reload
We launch like:
./bin/paster serve server.ini --reload
2011-06-18 17:59:38 -05:00
Christopher Allan Webber
d5234024b0
Tests for mediagoblin.config functions
...
Tests for:
- read_mediagoblin_config()
- generate_validation_report()
2011-06-18 16:52:40 -05:00
Christopher Allan Webber
e5aa1ec6b4
CONFIG_SPEC_PATH should be config_spec here, fixing.
2011-06-18 16:51:35 -05:00
cfdv
630b57a366
baby step towards enabling profile edits
...
adds
* url and bio fields to database
* form for editing the user profile
* route to the edit profile controller
* view for the profile editing page
* template for the profile editing page
* link to edit profile in the welcome page
still needs
* thorough inspection to see if it makes sense
* tests
* ?
2011-06-18 16:42:22 -05:00