Commit graph

4262 commits

Author SHA1 Message Date
Simon Rozet
2c7eb9c70f remove skinny_spec's init.rb which is causing test/unit to fail 2008-06-24 21:22:49 +02:00
Reinier Balt
258958ebdf solve merge conflict
Merge branch 'master' of git://github.com/bsag/tracks

Conflicts:

	.gitignore
2008-06-24 20:36:40 +02:00
Reinier Balt
ce1c092173 merge upstream 2008-06-24 20:35:30 +02:00
bsag
8ebc54cf3a Merge branch 'master' of git@github.com:bsag/tracks
* 'master' of git@github.com:bsag/tracks:
  Move over another ajax test from selenium to stories.
2008-06-24 17:08:30 +01:00
bsag
c9d0d9a920 Merge branch 'spec' of git://github.com/sr/tracks into sr/spec
* 'spec' of git://github.com/sr/tracks:
  update user scenario to work with sqlite3
2008-06-24 17:00:42 +01:00
Simon Rozet
f446effcc5 update user scenario to work with sqlite3 2008-06-24 17:11:48 +02:00
bsag
bfb55069e7 Merge branch 'spec' of git://github.com/sr/tracks into sr/spec
* 'spec' of git://github.com/sr/tracks:
  stop versionning schema.rb
  refactored context model spec to be a bit more 'rspec-ish' and to use skinny_spec and scenarios
  make custom spec macro `it_should_validate_length_of' accepts a message argument
  crreate some basic scenarios
  Install the `scenarios' plugin and require it in spec_helper
  Spec for `todo' model
  Spec for user model
  Install the `skinny_spec' plugin.
  fix a failing spec for context model
2008-06-24 13:58:56 +01:00
Simon Rozet
87444e7109 stop versionning schema.rb 2008-06-23 21:39:16 +02:00
Simon Rozet
e8d1ba2633 refactored context model spec to be a bit more 'rspec-ish' and to use skinny_spec and scenarios 2008-06-23 21:39:16 +02:00
Simon Rozet
d62cbf4592 make custom spec macro `it_should_validate_length_of' accepts a message argument 2008-06-23 21:38:41 +02:00
Simon Rozet
2672c1e2b7 crreate some basic scenarios 2008-06-23 21:38:04 +02:00
Simon Rozet
b13df20630 Install the `scenarios' plugin and require it in spec_helper
It is IMO a great alternative to fixtures.
See http://github.com/aiwilliams/scenarios/tree/master and further commits
for more information.
2008-06-23 21:34:21 +02:00
Reinier Balt
c58186451f Merge branch 'master' of git://github.com/bsag/tracks 2008-06-23 20:59:31 +02:00
Simon Rozet
6d54923e2f Spec for `todo' model 2008-06-23 12:28:38 +02:00
Simon Rozet
44b7f56c23 Spec for user model 2008-06-23 12:28:03 +02:00
Simon Rozet
0376067cf4 Install the `skinny_spec' plugin.
It's basically a set of rspec macro allowing you to write thing such as
`it_should_find_and_assign :users'.
See <http://github.com/rsl/skinny_spec/tree/master> for more informations.
It's recommended to install the `ruby2ruby' gem to have nicer error messages, but
it is not required to work.

@@ update README_FOR_DEVELOPERS accordingly.
2008-06-23 10:03:56 +02:00
Simon Rozet
60b986a5b9 fix a failing spec for context model 2008-06-23 10:03:55 +02:00
bsag
eb53865ff9 Context model specs completed. Using fixtures for some examples currently, but might convert to mocks in future. Specs now offer same coverage as Test::Unit tests for Context model. 2008-06-23 10:02:17 +02:00
bsag
1dc03195d0 Initial work on specs for models - Context model spec started. 2008-06-23 10:02:17 +02:00
Reinier Balt
5f3cdf5ce8 changes api description to follow solution in #738 2008-06-23 10:02:17 +02:00
Reinier Balt
e4c302cedd update version information.
Small change to see if I can push to the main repository
2008-06-23 10:02:17 +02:00
Luke Melia
d7f05fbfd4 Started moving selenium on rails tests over to RSpec stories. See the updated README_DEVELOPERS for info on running the new tests. 2008-06-23 10:02:17 +02:00
Luke Melia
58974ec138 Removed SimplyHelpful plugin (functionality has been rolled into Rails) and modified ResourceFeeder as necessary. 2008-06-23 10:02:17 +02:00
Luke Melia
2c09db45c5 Added Rspec and Webrat plugins and started porting Selenium on Rails tests to Rspec Plain Text Stories driving Webrat driving Selenium. 2008-06-23 10:02:17 +02:00
Luke Melia
adde38eecb Move over another ajax test from selenium to stories. 2008-06-23 00:36:05 -04:00
bsag
6f760c768e Context model specs completed. Using fixtures for some examples currently, but might convert to mocks in future. Specs now offer same coverage as Test::Unit tests for Context model. 2008-06-22 15:30:38 +01:00
Reinier Balt
ef2ea8f3e4 Merge branch 'master' of git://github.com/bsag/tracks 2008-06-22 10:46:26 +02:00
bsag
6e0999bd06 Initial work on specs for models - Context model spec started. 2008-06-21 14:28:01 +01:00
bsag
7ef4c96b1e Merge branch 'master' of git@github.com:bsag/tracks
* 'master' of git@github.com:bsag/tracks:
  changes api description to follow solution in #738
2008-06-21 11:00:43 +01:00
Reinier Balt
4139a6bc82 changes api description to follow solution in #738 2008-06-20 08:37:31 +02:00
bsag
91f31d8af3 Merge branch 'master' of git@github.com:bsag/tracks
* 'master' of git@github.com:bsag/tracks:
  update version information.
  Started moving selenium on rails tests over to RSpec stories. See the updated README_DEVELOPERS for info on running the new tests.
  Removed SimplyHelpful plugin (functionality has been rolled into Rails) and modified ResourceFeeder as necessary.
  Added Rspec and Webrat plugins and started porting Selenium on Rails tests to Rspec Plain Text Stories driving Webrat driving Selenium.
2008-06-19 18:51:31 +01:00
Reinier Balt
a095f8cb0e merge upstream changes 2008-06-19 10:13:59 +02:00
Reinier Balt
4e890524f0 Merge branch 'master' of git://github.com/bsag/tracks 2008-06-19 10:13:14 +02:00
Reinier Balt
12d3b8eeee update version information.
Small change to see if I can push to the main repository
2008-06-19 08:50:11 +02:00
Luke Melia
d47e863dfc Started moving selenium on rails tests over to RSpec stories. See the updated README_DEVELOPERS for info on running the new tests. 2008-06-19 00:14:04 -04:00
Luke Melia
85dc6f4898 Removed SimplyHelpful plugin (functionality has been rolled into Rails) and modified ResourceFeeder as necessary. 2008-06-18 16:13:37 -04:00
bsag
7b432a74ed Schema update after Rails 2.1 update 2008-06-18 13:31:16 +01:00
Reinier Balt
79775b1483 fixes routes.rb 2008-06-18 10:33:06 +02:00
Reinier Balt
952a73e39d Merge branch 'master' of git://github.com/bsag/tracks
Conflicts:

	config/routes.rb
2008-06-18 10:13:56 +02:00
Luke Melia
0f7d6f7a1d Added Rspec and Webrat plugins and started porting Selenium on Rails tests to Rspec Plain Text Stories driving Webrat driving Selenium. 2008-06-18 02:57:57 -04:00
Luke Melia
0600756bbf Added missing fixture to context API integration test. Previously caused a failure when run in isolation. 2008-06-17 12:35:36 -04:00
Luke Melia
901a58f8a3 Upgraded to Rails 2.1. This can have wide ranging consequences, so please help track down any issues introduced by the upgrade. Requires environment.rb modifications.
Changes you will need to make:

 * In your environment.rb, you will need to update references to a few files per environment.rb.tmpl
 * In your environment.rb, you will need to specify the local time zone of the computer that is running your Tracks install.

Other notes on my changes:

 * Modified our code to take advantage of Rails 2.1's slick time zone support.
 * Upgraded will_paginate for compatibility
 * Hacked the Selenium on Rails plugin, which has not been updated in some time and does not support Rails 2.1
 * Verified that all tests pass on my machine, including Selenium tests -- I'd like confirmation from others, too.
2008-06-17 01:13:25 -04:00
bsag
f3bae73868 Added TextMate *.tmproj files to .gitignore 2008-06-16 18:27:07 +01:00
bsag
d3649e6b25 Updated docs with the instructions for getting development versions from git. 2008-06-16 18:24:54 +01:00
Reinier Balt
7098afb8d3 routes update? 2008-06-16 16:13:33 +02:00
Reinier Balt
c8d7466ca5 ignore proejct files from netbeans 2008-06-16 16:04:59 +02:00
Reinier Balt
8a3ba65bb7 somehow these files have been marked a changed after the pull 2008-06-16 15:24:02 +02:00
bsag
12b2c06b71 Added line to .gitignore to ignore db/*.sqlite3 files.
I suggest that users use the .sqlite3 suffix for their databases, and reserve .db for the example databases.
2008-06-15 10:43:48 +01:00
bsag
1b00a314ae Added patch by Eric to fix users_controller_test. Fixes #735.
<http://dev.rousette.org.uk/ticket/735>
2008-06-15 10:38:58 +01:00
bsag
c1109b3fb3 Merge branch 'svn-tracking'
Up to r881 of svn repository
* svn-tracking: (22 commits)
  Added .gitconfig
  Added yaml_db plugin: http://opensource.heroku.com/
  applied patch from Eric from #732
  fixes #730 restores ability to delete user from user management page
  fixes #724 where editing todos truncates the project name of the todo when the project name contains quotes (")
  Applied patch from Eric Pallen whcih automatically converts url's to links. Thanks Eric!
  explain that yaml cannot yet be used for backup as importing is not implemented yet. from mailinglist.
  hopefully fixes #727.Changes the check on running animation to finished animation
  regenerate compressed js and cleanup whitespace
  turns out that getElementsByClassName is removed from prototype and it therfore falls back to the function of the browser which has different semantics. Found here http://www.prototypejs.org/api/utility/getElementsByClassName
  forgot to create a new compressed js from the previous js changes
  in the stats page you can downdrill to see the active todos in a certain week from the running time charts. This patch adds the option to see all active todos from the selected week and older.
  fix #727. Adds a check to prevent expand/collapse while a previous expand/collaps is still animating
  fixed small problem where updating a todo from mobile resulted in an error becase source_view was nil
  fixes #726. Thanks Eric Pallen for the fix. The mobile view showed active todos from completed projects while the home page does not.
  merges changes from tracks1.6 to trunk
  prepares trunk for 1.6 release
  fixes #713. Adds behavior for edit/star/delete/check buttons of todo even if there is no todo to show. This makes sure that the behaviors are present when you add a new todo through AJAX.
  fixes #718. The link included the number of actions which resulted from last commit
  removed some more whitespace to reduce the download of the mobile view.
  ...
2008-06-15 09:59:22 +01:00