Commit Graph

107 Commits (2b2df9d3b54ac6f6e8566ad17da186e376273c58)

Author SHA1 Message Date
Raymond Yee 71bd2a88c9 Had to fix campaign_starter.sql so that the migration to create core.models.Key doesn't fail 2012-05-09 11:36:13 -07:00
Raymond Yee 194298cdef Adjusted selenium test for latest UI change 2012-05-09 09:42:59 -07:00
Raymond Yee da8707b597 Setting up a campaign_starter that has a paypaltest account 2012-05-09 08:59:21 -07:00
Raymond Yee 8d74baef95 Merging fps and master together 2012-05-07 16:53:12 -07:00
Raymond Yee 3725094aea A few more steps needed to get rid of billing (aka django-merchant) 2012-05-03 11:17:27 -07:00
Raymond Yee c83aa8615a Removing django-merchant dependency 2012-05-03 10:58:08 -07:00
Raymond Yee 9887de6e9a Updated the campaign_starter.sql to match the latest db migrations 2012-05-03 01:26:44 +00:00
Raymond Yee 061f656e63 Merge branch 'jkace' of github.com:Gluejar/regluit into fps
Also fixed things so that regluit.test.campaigntest.support_campaign runs for Amazon without error -- though I still need to confirm that the status of transactions properly handled
Next up:  see whether this works for PayPal too.

Conflicts:
	frontend/views.py
2012-04-25 13:10:53 -07:00
Raymond Yee 709cb4ce41 now stuck on the status of an ACTIVE transaction in amazon in campaign_test 2012-04-24 18:03:57 -07:00
Raymond Yee 5ebbee7e7a creating a regluit.test.campaigntest.support_campaign that also supports amazon fps 2012-04-24 11:58:00 -07:00
Raymond Yee 565261c12b Updated campaign_starter.sql to handle new migrations in payment 2012-04-21 16:17:51 -07:00
Raymond Yee dbdfbac2fe Test data RY uses often to test campaigns....
cat test/campaign_starter.sql | django-admin.py dbshell

(e.g., java -jar test/selenium-server-standalone-2.20.0.jar > selenium-rc.log 2>&1 &

django-admin.py shell_plus

from regluit.test import campaigntest
s = campaigntest.support_campaign()
sel = s.next()

see screencast of what selenium script does: http://www.screencast.com/users/rdhyee/folders/Jing/media/34ebf6ed-d231-4839-87e5-6237825e8652
screencast is slightly out of date
2012-04-20 15:53:28 -07:00
Raymond Yee ba9123ba39 Sets form action properly in pledge.html depending on whether new pledge or modified pledge.
campaigntest.support_campaign changed to handle new premium selection process, which now changes the preapproval amount
2012-04-19 15:43:21 -07:00
Raymond Yee 3dcacf881f Add a function to fire off a successful_campaign signal 2012-04-03 07:08:05 -07:00
Raymond Yee 0e61d7477a [#22756079] Changed name of constants (e.g., IPN_PAY_STATUS_ACTIVE to IPN_PREAPPROVAL_STATUS_ACTIVE to make the meaning of these constants clearer
Also fixed an error in how I'm using transaction management in regluit.test.campaigntest.support_campaign
2012-03-23 11:28:09 -07:00
Raymond Yee 4c8578cb3f Allow a bit more start time in campaigntest.support_campaign 2012-03-23 09:24:38 -07:00
Raymond Yee c08bd9b54b I had left a debugging message in pledge_modify.html -- now removed.
I figured out the problem of why regluit.test.campaigntest.support_campaign could not see the new Transaction -- it was locked in a database transaction that had an older snapshot of the db.  fix came from http://stackoverflow.com/a/4739960/7782
2012-03-22 14:51:43 -07:00
Raymond Yee 6d0e5c6a3e [#23019867] I think these changes now allow one to modify pledges and the validation of the CampaignPledgeForm is happening properly now. 2012-03-22 12:12:46 -07:00
Raymond Yee ffb7c8cd33 [#23019867] I believe this commit implements the rest of the pledge changing functionality and works as far as I can tell so far.
The one part I don't get yet is why the regluit.test.campaigntest.support_campaign script can successfully drive the browser to create a transction and then
change that pledge to create 2 transactions in total -- and yet until regluit.payment.manager.PaymentManager.check_status is run twice, there seems to be only
one transaction visible to the script.

Does this have to do with Django transactions?  I don't know yet.
2012-03-21 15:06:56 -07:00
Raymond Yee 5823c0e2de [#23019867] At this point, a supporter can change the pledge amount to a smaller amount (no new PayPal transaction required) or a larger amount (a new PayPal transaction is required and the old transaction is canceled.)
I've not implemented the storage of the premium yet -- that's coming next.
I've not implemented straight out cancellation of a pledge yet.
More UI refinement needed, especially around encouraging supporters not to decrease (or cancel) a pledge and refinements to help people know that they have made a modification.
2012-03-20 14:10:21 -07:00
Raymond Yee 9ece33899a support_campaign test is now able to run all the way to doing a modification of pledge for lesser amounts 2012-03-20 11:21:06 -07:00
Raymond Yee 744693f178 1) Fix an error in which I wasn't checking properly that the pledge_complete page should allow only the pledging user to see the results.
2) Now tests.campaigntest.support_campaign takes us all the way through pledging for the first campaign
2012-03-19 11:46:41 -07:00
Raymond Yee a17bd85519 Now support_campaign can get all the way to just before pledging at the PayPal sandbox 2012-03-16 09:27:06 -07:00
Raymond Yee 571e565b5e [Fixes #26515771] Now if you hit submit on default blank campaign pledge page, we won't get an error. 2012-03-15 14:54:38 -07:00
Raymond Yee 9199f78606 test/campaigntests.py has a BasicGuiTest.testFrontPage, which tests whether the Learn More link will toggle the description panel.
paypal/tests.py:  made loginSandbox drop the test parameter and callable from outside of paypal/tests.py -- now, for example, from test/campaigntests.py
settings/dev.py:  added LIVE_SERVER_TEST_URL, UNGLUEIT_TEST_USER, UNGLUEIT_TEST_PASSWORD -- parameters useful for selenium-based live server testing
the beginnings of test/campaigntests.support_campaign() -- a selenium script to drive automated pledging to campaign for testing purposes
2012-03-14 15:06:29 -07:00
Raymond Yee b1ccf6832b Add the setup_selenium method to allow for headless running of selenium 2012-03-13 11:01:49 -07:00
Raymond Yee c698827d81 Rewriting of simple Google selenium example in WebDriver 2012-03-13 10:37:19 -07:00
Raymond Yee e1fc176031 Merge branch 'master' of github.com:Gluejar/regluit into payment 2012-03-02 09:32:01 -08:00
Raymond Yee 359ff71984 Add g_seed_isbn.json which hold the Gutenberg editions I'm loading. 2012-02-27 13:19:58 -08:00
Raymond Yee e5988b468e Need to fix print statement to emit only ascii 2012-02-24 14:08:14 -08:00
Raymond Yee f7220d9812 Programs and data for fighting Frankenworks 2012-02-24 12:06:24 -08:00
Raymond Yee 9dd2a07f9a Changing xpath for the google search box 2012-02-23 14:49:27 -08:00
Raymond Yee 1d001f33ba Now I think I'm able to calculate the timedate of when the latest "frankenwork" merging is happening 2012-02-21 08:54:12 -08:00
Raymond Yee 2e079b2c2e Now I have booktests to recalculate clusters 2012-02-17 10:30:09 -08:00
eric 471cb62fd2 changed core.tasks to not use models 2012-02-16 13:19:36 -05:00
Raymond Yee 4752181ace Move add_missing_isbn_to_editions to bookloader.py 2012-02-15 19:36:18 -08:00
Raymond Yee a8f1c157be Check current progress in so that I can focus on a change in the master branch to add missing isbns to Editions 2012-02-15 16:06:40 -08:00
Raymond Yee 2f09d21fae Don't load gutenberg book if seed_isbn is None 2012-02-15 09:09:24 -08:00
Raymond Yee 9fb57a6b4e At this point, I have logic in regluit.test.bookloader.load_gutenberg_books to read the data from regluit/experimental/gutenberg/g_seed_isbn.json and load books into the db. Still shaking out bugs from the process though. 2012-02-14 18:01:13 -08:00
Raymond Yee c04aacec4a Putting away my work for ry...hope it's ok 2012-02-13 11:28:21 -08:00
Raymond Yee fa0a363ad6 THIS VERSION OF parallel_with_manager is broken....I'm putting it away for now 2012-02-07 10:16:44 -08:00
Raymond Yee af9aa5ab19 A working version before I try to have more than one queue of works 2012-02-07 07:50:07 -08:00
Raymond Yee 9334ab0cdb I've learned how to use a multiprocessing.Manager and dict to share results. Now can I extend it? 2012-02-06 20:16:37 -08:00
Raymond Yee 278701c56b FAILED attempt to use Pool to process tripler, negator, etc. Now changing gears 2012-02-06 17:10:56 -08:00
Raymond Yee 1a23862321 parallel.py: still working towards how to run a series of calculations in parallel to support calculating the seed isbn for Gutenberg books
load_test.py:  a simple program to make simulaneous calls to unglue.it to see how it performs under load
2012-02-06 09:21:23 -08:00
Raymond Yee bf6fb65bc4 Things working: next step -- enqueue doubler, tripler, negator 2012-02-05 09:42:07 -08:00
Raymond Yee af6d98383b Now we have a Task class and a queue for the tasks and a group of Consumers to pull work off the task queue 2012-02-04 14:57:57 -08:00
Raymond Yee 35d8f576a4 First draft of a parallel processed program to calculate seed ISBNs 2012-02-04 14:15:00 -08:00
Raymond Yee 568a4fb4db Getting close to implementing Gutenberg loading for at least one book Moby Dick 2012-02-01 17:09:04 -08:00
Raymond Yee da552d75db Two tests to demonstrate that the queryset queries using distinct() and order_by() generate the correct results 2012-02-01 17:41:22 +00:00
Raymond Yee 17c8de9473 Add a bit more detail to querytests.list_new 2012-02-01 08:33:11 -08:00
Raymond Yee 020f4266d3 Adding a test to make sure that new and popular are correct 2012-02-01 08:27:21 -08:00
Raymond Yee 3a30e22814 A stepping stone towards loading Gutenberg books. Loading Moby Dick seems to be working more or less 2012-01-31 18:09:01 -08:00
Raymond Yee 069985e02c Comment on the "tests" 2012-01-27 17:06:10 -08:00
Raymond Yee 5fba8be6a6 Changed the URL so that "all collections" loaded from Librarything, not just "my library"
In add_related, make sure edition is not None before trying to add related editions
A demo test
2012-01-27 16:16:46 -08:00
Raymond Yee c5e84d7006 Moved campaigntest.py to test/campaigntest.py
Added a simple selenium test to campaigntest to illustrate how to do a google search and test for the presence of text
Updated payment.tests to use the right settings for PayPal sandbox accounts
payment.tests.AuthorizeTest working for RY on laptop.  PledgeTest is going through the motions but not quite working yet
2012-01-04 10:52:19 -05:00
Raymond Yee 88f9fc6a1d This commit is not complete but I want to do so as a stepping stone. 2011-10-04 15:12:59 -07:00