aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
Commit message (Collapse)AuthorAgeFilesLines
* make sure both headers are set before checking for ip spoofingTamir Duberstein2013-10-011-0/+10
|
* Fix test incompatible with 1.8.7Eugene Kalenkovich2013-08-181-4/+4
|
* Add test to prevent route reloading regressionAndrew White2013-07-211-0/+45
| | | | | | | Journey doesn't clear its named route hash when the routes are reloaded but Rails 3.2 isn't affected because Journey overwrites the existing route. This is just a backport of the test to make sure it doesn't become affected in some future release.
* Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-123-0/+48
|\ | | | | | | | | | | | | backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
| * backport runner fixes to 3-2-stablekennyj2012-12-163-0/+48
| | | | | | | | | | | | | | Add a runner hook to Rails::Application and Rails::Engine that requires ActiveRecord::Base to avoid circular constant loading when using observers. This commit backports cc7dd66, c0ba0f0 and 8d01c61.
* | Build fix for scaffold generator Arun Agrawal2013-05-071-1/+1
| | | | | | 3-2 behaves different when scaffolding.
* | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
| | | | | | | | Fix tests related to scaffolding generator with --assets=false switch
* | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-041-0/+14
| | | | | | | | | | | | | | | | | | | | Fixes Scaffold generator with --assets=false Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
* | adding a test for root path in the appAaron Patterson2013-04-171-0/+24
| |
* | Backported #6755 to 3-2-stable. Don't read csv file during executing ↵Narihiro Nakamura2013-02-281-0/+12
| | | | | | | | db:fixtures:load.
* | Define #inspect instead of #to_sPrem Sichanugrist2013-02-241-2/+2
| | | | | | | | Ruby 2.0 Object#inspect does not call #to_s by default anymore.
* | Fix failing test case when no database.ymlPrem Sichanugrist2013-02-241-4/+11
| |
* | Add in missing requiresPrem Sichanugrist2013-02-241-0/+1
| |
* | Fix the TestCase class and make tests pass on ruby 2.0Rafael Mendonça França2013-01-141-2/+2
| |
* | Add regression test to #8907Rafael Mendonça França2013-01-141-0/+31
| |
* | backport #8616, quote column names in generated fixture filesYves Senn2012-12-261-2/+19
|/ | | | | | | | | Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/test_unit/model/model_generator.rb railties/lib/rails/generators/test_unit/model/templates/fixtures.yml railties/test/generators/model_generator_test.rb
* Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-141-6/+6
|
* Clear url helper methods when routes are reloadedAndrew White2012-12-141-0/+71
| | | | | | | | Clear url helper methods when routes are reloaded by removing the methods explicitly rather than just clearing the module because it didn't work properly and could be the source of a memory leak. Closes #8488.
* backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-151-0/+6
| | | | | | | | | | | The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. Closes #8224 Conflicts: railties/CHANGELOG.md
* Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-133-3/+4
|
* Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
| | | | This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
* fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-292-0/+230
| | | | | | | | | | | | | | | | Backport for #7521 - added tests to confirm establish_connection uses DATABASE_URL and Rails.env correctly even when no arguments are passed in. - updated rake db tasks to support DATABASE_URL, and added tests to confirm correct behavior for these rake tasks. (Removed establish_connection call from some tasks since in those cases the :environment task already made sure the function would be called) - updated Resolver so that when it resolves the database url, it removes hash values with empty strings from the config spec (e.g. to support connection to postgresql when no username is specified). - updated ResolverTest to use current_adapter? to check the type of the current adapter.
* Add test case to assets eager loadRafael Mendonça França2012-10-271-0/+3
|
* Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-10-012-3/+75
| | | | | | | | Master branch: Fixed generated whitespace in routes when using namespaced resource. Merge pull request #7811 from iHiD/resource_generator_routes_master Fix the build (Broken scaffold routes test)
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. ↵Jeremy Kemper2012-09-301-1/+16
| | | | Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
* Hashrocket for 1.8 supportJeremy Kemper2012-09-281-2/+2
|
* Tune up Rails::Rack::Logger. Only put space between requests in development ↵Jeremy Kemper2012-09-271-6/+6
| | | | | | | logs. Conflicts: railties/test/application/rack/logger_test.rb
* Explictly set the assets digest option to falseRafael Mendonça França2012-09-201-2/+5
|
* We need to have 1-0-stable for joureny gem in edgeArun Agrawal2012-08-241-1/+2
| | | | | Problem : Edge rails can't bundle Fixes #7437
* Fix invalid asset compile assertionsJoshua Peek2012-08-071-3/+2
| | | | Logical paths to compile should require an extension
* make assertions easier to track downAaron Patterson2012-08-071-9/+17
|
* html_escape should escape single quotesSantiago Pastorino2012-08-021-2/+2
| | | | | | | | | | | | https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/template/erb_util_test.rb actionpack/test/template/form_tag_helper_test.rb actionpack/test/template/text_helper_test.rb actionpack/test/template/url_helper_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb
* Merge pull request #6690 from suginoy/fix-templates-copyRafael Mendonça França2012-06-111-0/+12
| | | | | | Fix: 'rake rails:templates:copy' doesn't work Conflicts: railties/test/application/rake_test.rb
* Don't add sqlite3 to gemspec with -O on rails plugin newPiotr Sarnacki2012-06-081-0/+8
| | | | (closes #6672)
* Merge pull request #6678 from arunagw/fix_issue_6673Rafael Mendonça França2012-06-081-0/+8
|\ | | | | Fix issue 6673
| * We should not include engine.rake file into rakeArun Agrawal2012-06-081-0/+8
| | | | | | | | | | | | | | | | | | | | if we are passing -T which is skip_test_unit See issue #6673 for more details. I saw that we are not creating dummy app even if we do skip_test_unit. Fixes #6673
* | Removed protected as we already doing it above. Arun Agrawal2012-06-081-2/+0
|/
* Revert "fix the Flash middleware loading the session on every request (very ↵Rafael Mendonça França2012-06-051-20/+0
| | | | | | | | | dangerous especially with Rack::Cache), it should only be loaded when the flash method is called" This reverts commits e3069c64b2c5ddc7a5789b55b8efd4902d9e9729 and 2b2983d76fd11efc219273036a612f47cfaa5bfa. Reason: This add a non-backward compatible change in the way that flash works now (swept in every request).
* Changed symbol platform to platforms for the commented out call to gem ↵Martin O'Connor2012-05-301-1/+1
| | | | | | | 'therubyracer'. Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms. Updating tests.
* Remove irrelevant assertionOscar Del Ben2012-05-291-7/+0
|
* Display annotations from .coffee files in `rake notes`Bartlomiej Kozal2012-05-281-5/+16
|
* Fix railties_order when application object is passedPiotr Sarnacki2012-05-271-0/+4
| | | | | | | | | | | | | | | railites_order method, introduced in 40b19e0, had a bug that was causing loading application instance twice in initializers if railties_order already included application instance. So for example railties_order = [Foo::Engine, :main_app, Bar::Engine] would result in such railties array: [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine] In order to fix it, we need to check for existence of application in both railties_order and railties arrays.
* Use require_dependency in generated controllersPiotr Sarnacki2012-05-221-2/+2
| | | | | | | Using require in development mode will prevent required files from reloading, even if they're changed. In order to keep namespaced application_controller reloadable, we need to use require_dependency instead of require.
* Fix generators to help with ambiguous `ApplicationController` issuePiotr Sarnacki2012-05-201-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In development mode, dependencies are loaded dynamically at runtime, using `const_missing`. Because of that, when one of the constants is already loaded and `const_missing` is not triggered, user can end up with unexpected results. Given such file in an Engine: ```ruby module Blog class PostsController < ApplicationController end end ``` If you load it first, before loading any application files, it will correctly load `Blog::ApplicationController`, because second line will hit `const_missing`. However if you load `ApplicationController` first, the constant will be loaded already, `const_missing` hook will not be fired and in result `PostsController` will inherit from `ApplicationController` instead of `Blog::ApplicationController`. Since it can't be fixed in `AS::Dependencies`, the easiest fix is to just explicitly load application controller. closes #6413
* Added test for assets:precompile for index filesDmitry Vorotilin2012-05-011-0/+9
|
* Failing test for #6034Piotr Sarnacki2012-04-301-0/+20
|
* Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ↵Aditya Sanghi2012-04-171-2/+2
| | | | maintained debugger gem
* "rails new -h" shows message in rails directoryask2012-04-131-0/+10
|
* log which config format AR uses to connect withTerence Lee2012-04-031-0/+19
|
* test initializer logic for DATABASE_URL env varTerence Lee2012-04-031-0/+43
|