diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-10-09 02:23:03 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-10-09 02:23:03 +0000 |
| commit | ccd32adecae3e95836effe8c96ac215e9b9e580e (patch) | |
| tree | 900db85ac21b508a2dc04f7c2d9900b7fa4050cb /railties | |
| parent | 0d8b8056be56b1ec988ca7c7db44f5b3768792e9 (diff) | |
| download | rails-ccd32adecae3e95836effe8c96ac215e9b9e580e.tar.gz rails-ccd32adecae3e95836effe8c96ac215e9b9e580e.tar.bz2 rails-ccd32adecae3e95836effe8c96ac215e9b9e580e.zip | |
Fixed test:uncommitted on Windows (backslash issue) (closes #4999) [paul@paulbutcher.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5263 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/testing.rake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index cf88791b07..43c9b846b0 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed test:uncommitted on Windows (backslash issue) #4999 [paul@paulbutcher.com] + * Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [BobSilva] * Fixed rename_table on SQLite tables with indexes defined #5942 [brandon@opensoul.org] diff --git a/railties/lib/tasks/testing.rake b/railties/lib/tasks/testing.rake index 28ef8fb4ec..4f0292c854 100644 --- a/railties/lib/tasks/testing.rake +++ b/railties/lib/tasks/testing.rake @@ -67,8 +67,8 @@ namespace :test do def t.file_list changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] } - models = changed_since_checkin.select { |path| path =~ /app\/models\/.*\.rb/ } - controllers = changed_since_checkin.select { |path| path =~ /app\/controllers\/.*\.rb/ } + models = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb/ } + controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb/ } unit_tests = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" } functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" } |