Commit graph

2650 commits

Author SHA1 Message Date
Dan Rice
59989d3127 Merge remote-tracking branch 'upstream/master' 2013-03-19 16:47:20 -04:00
Dan Rice
66a84e0b71 Fix error running functional tests under Ruby 2.0.0 2013-03-19 16:43:06 -04:00
Matt Rogers
93ad2fd44c Merge pull request #176 from kytrinyx/refactor-pie-chart
Refactor pie chart data
2013-03-18 21:06:00 -07:00
Katrina Owen
a4ae0c03bf Fix failing tests 2013-03-18 21:54:19 -06:00
Katrina Owen
a690e4a4cd Extract methods in pie chart data model 2013-03-18 19:57:42 -06:00
Katrina Owen
961227da0c Extract pie chart data logic into model layer
Move most of the tests for this logic into the unit test layer.
2013-03-18 19:49:54 -06:00
Katrina Owen
9f3470f9dc Shave off slight redundancy 2013-03-18 18:59:56 -06:00
Katrina Owen
f3a076c2af Turn unreferenced ivars into local variables 2013-03-18 18:58:36 -06:00
Katrina Owen
6e2f1a8e5f De-dupe pie chart view
Pull logic into the controller from the view. There were only a couple
of tiny differences between the running actions and the total actions
view, so I added a couple of instance variables and then called the same
template twice.
2013-03-18 18:56:41 -06:00
Dan Rice
03de773f2b Fix a case mismatch in one of the tests 2013-03-18 23:31:57 +02:00
Dan Rice
11c5f988db Update Rails to 3.2.13 2013-03-18 14:16:04 -04:00
Matt Rogers
0cd6656be2 Merge pull request #175 from kytrinyx/pie-chart-bug
Add heavy-handed tests against pie chart bug
2013-03-18 06:41:38 -07:00
Katrina Owen
4fe9003855 Tweak pie chart data tests 2013-03-18 07:25:00 -06:00
Reinier Balt
ee43ccbee6 remove leftover from merge failure 2013-03-18 12:43:22 +01:00
Reinier Balt
2596d612fa hide group by project from menu to safely merge refactorings with master 2013-03-18 12:36:40 +01:00
Reinier Balt
85fc82d494 refactor done todos view and tests 2013-03-18 12:36:40 +01:00
Reinier Balt
aac744e411 rebase to master 2013-03-18 12:36:40 +01:00
Reinier Balt
0a9755c8a3 get all scenario's running again, first pass. 2013-03-18 12:36:40 +01:00
Reinier Balt
ede898120c remove option to show empty containers and start fixing failing cucumber scenarios 2013-03-18 12:36:40 +01:00
Reinier Balt
22b371ef8c do a big refactor of rendering collections of todos for home page, tag page, project page, context page 2013-03-18 12:36:40 +01:00
Reinier Balt
f22dfc1f9b initial changes to add an option to select either context or project as grouping of todos on home or tag page
* new menu item in view menu
* js to toggle view
* store setting in cookie to keep de choice of view persistent
* refactor index and tag page of todos to look more alike
* refactor context and project partials to look more alike
2013-03-18 12:32:28 +01:00
Katrina Owen
d6ed7d9722 Add heavy-handed tests against pie chart bug 2013-03-17 19:20:48 -06:00
Matt Rogers
55aa387ab9 Merge pull request #174 from kytrinyx/pie-chart-bug
Fix off-by-one error in pie chart data
2013-03-17 17:12:53 -07:00
Katrina Owen
08cf7ca542 Fix grammar in pie chart legend 2013-03-17 16:29:19 -06:00
Katrina Owen
119e536a97 Fix off-by-one error in pie chart data
A pie chart with exactly 10 contexts would show up with 9 contexts +
(other).
2013-03-17 16:20:12 -06:00
Dan Rice
d0a12a7010 Merge pull request #173 from zoombody/remove_formatize
Render notes using RedCloth without formatize
2013-03-13 08:58:48 -07:00
Dan Rice
dc311221f1 Render notes using RedCloth without formatize
Removes the outdated bluecloth dependency
2013-03-13 17:03:58 +02:00
Matt Rogers
f541a4c9d6 Simplify SearchController#results
Give names to the various things being searched for and move them out
into their own methods. Also add scopes to give names to things being
queried out of the models.
2013-03-12 19:49:19 -05:00
Matt Rogers
63fc460c00 Refactor the empty message criteria into its own method.
Removes plenty of duplication in the code
2013-03-12 14:21:12 -05:00
Matt Rogers
053e3fc8d6 Guard against the case days stale can be negative 2013-03-10 22:48:27 -05:00
Matt Rogers
d699359648 Move the view logic back into the helper
Staleness#days_stale only gives us the number of days that a Todo has
been stale. Add the logic for choosing the CSS class to use back to the
view helper.
2013-03-10 22:18:59 -05:00
Matt Rogers
c1c81d7653 Remove some of the time objects we no longer need 2013-03-10 13:55:21 -05:00
Matt Rogers
809154332f Remove the fake preferences object
It's no longer needed since we're not using the preferences in this
object anymore.
2013-03-10 13:47:26 -05:00
Matt Rogers
43275e064e Refactor the calculation for staleness
Provide the number of days that the todo was stale instead of a class
name to use in the view.

We'll use the number of days stale in the helper to determine the class
name
2013-03-10 13:46:22 -05:00
Matt Rogers
8dfbac0fe8 Use the newly extracted method object for getting todo staleness 2013-03-09 22:38:38 -06:00
Matt Rogers
8ffe3cacca Move the fakes so that they're namespaced by the test
Prevents errors since the names clash with names used in other tests.
2013-03-09 22:38:38 -06:00
Matt Rogers
ccf5323588 Encapsulate the concept of staleness into its own class
Extract it from a single helper method and wrap it in a method object.
This lets us add tests around it and then (later) split the domain
concerns from the view concerns.
2013-03-09 22:38:38 -06:00
Dan Rice
d7e9b384f7 Clean up a couple hardcoded strings in alt tags 2013-03-09 12:46:05 -05:00
Dan Rice
cb5114922e Add instructions relating to renamed Czech locale 2013-03-09 12:35:42 -05:00
Matt Rogers
ea7ab390e7 allow build failures on 2.0.0 for now 2013-03-05 13:56:45 -06:00
Matt Rogers
47f096e097 Merge pull request #171 from kytrinyx/fix-stats-test
Refer to view values correctly in test
2013-03-05 06:52:39 -08:00
Matt Rogers
01f7af89dd Merge pull request #170 from kytrinyx/rename-index-page
Use a more appropriate name for stats domain object
2013-03-05 06:51:59 -08:00
Katrina Owen
3479585991 Use a more appropriate name for stats domain object 2013-03-05 07:49:44 -07:00
Katrina Owen
0b3a0b58a8 Refer to view values correctly in test 2013-03-05 07:48:08 -07:00
Dan Rice
34e0c2b13a Revert "Use db:schema:load instead of db:migrate"
This reverts commit 3c5f28869b,
which did not function properly on the continuous integration server.
2013-03-05 01:00:24 -05:00
Dan Rice
3c5f28869b Use db:schema:load instead of db:migrate 2013-03-04 12:50:30 -05:00
Dan Rice
9cdea2c51f Check schema.rb into source control
This practice is "strongly recommended."
http://guides.rubyonrails.org/migrations.html#schema-dumps-and-source-control
2013-03-04 12:42:59 -05:00
Matt Rogers
66827d0640 add test coverage for when we don't have any users
It wasn't being covered in the functional test for this controller.
2013-03-03 13:56:24 -06:00
Matt Rogers
7c5028f227 add the mocha stubbing and mocking library 2013-03-03 13:56:18 -06:00
Reinier Balt
0f7ed245c6 Merge pull request #169 from kytrinyx/index-page
Encapsulate dependencies of stats index page
2013-03-03 06:35:29 -08:00