Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #11726 from atambo/isolate_generator_tests | Guillermo Iguaran | 2013-08-02 | 1 | -0/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Isolate railties Generators Tests | |||||
| * | | | | | Isolate railties Generators Tests | Alex Tambellini | 2013-08-02 | 1 | -0/+1 | |
|/ / / / / | | | | | | | | | | | | | | | | With this change jruby should pass all of the railties tests. | |||||
* | | | | | add a test for concat on hm:t associations | Aaron Patterson | 2013-08-02 | 1 | -0/+7 | |
| | | | | | ||||||
* | | | | | Merge pull request #11721 from gaurish/join-timeout | Guillermo Iguaran | 2013-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add timeout to test_async_stream | |||||
| * | | | | | Add timeout to test_async_stream | Gaurish Sharma | 2013-08-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without timeout: this test executed infinitely on JRuby Passes on MRI With Timeout: this test gracefully fails on JRuby Passes on MRI, tested on v2.0 & v1.9.3 | |||||
* | | | | | | Merge pull request #11725 from atambo/jruby_capture_unlink | Guillermo Iguaran | 2013-08-02 | 1 | -0/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix jruby warning when capture calls unlink on an open tempfile | |||||
| * | | | | | | Fix jruby warning when capture calls unlink on an open tempfile | Alex Tambellini | 2013-08-02 | 1 | -0/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Jruby cannot unlink a tempfile unless it is closed first. | |||||
* | | | | | | Merge pull request #11712 from atambo/activesupport_testing_isolation_jruby | Rafael Mendonça França | 2013-08-02 | 1 | -48/+4 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix ActiveSupport::Testing::Isolation on jruby | |||||
| * | | | | | | Fix ActiveSupport::Testing::Isolation on jruby | Alex Tambellini | 2013-08-02 | 1 | -48/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully the first of many related to #11700. With these changes the railties tests wont 100% pass but at least they will run and show the errors. The first problem was the @method_name variable was never set. This was causing ENV["ISOLATION_TEST"] to always be nil which would cause the test output to never be written to the tempfile. The second problem was that an invalid -t option was being passed to minitest and minitest was erroring out. The third problem was the run method needs to always return an instance of the test class it is trying to isolate. We were returning a ProxyTestResult instead. | |||||
* | | | | | | | Merge pull request #11722 from arunagw/removed-deprecation-silenced-from-test | Rafael Mendonça França | 2013-08-02 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | As we are doing debug mode on | |||||
| * | | | | | | | As we are doing debug mode on | Arun Agrawal | 2013-08-02 | 1 | -2/+0 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | we don't need to silenced it | |||||
* | | | | | | | Merge pull request #11716 from ↵ | Carlos Antonio da Silva | 2013-08-02 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/use_backquote_for_terms_in_getting_strated Replaced quotation marks for term by apostrophes in getting started guide [ci skip] | |||||
| * | | | | | | | Replaced quotation marks for term by apostrophe | Paul Nikitochkin | 2013-08-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in getting started guide for section 5.6 [ci skip] | |||||
* | | | | | | | | Merge pull request #11720 from arunagw/added-av-in-rails-info | Guillermo Iguaran | 2013-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added action_view in Rails::Info | |||||
| * | | | | | | | | Added action_view in Rails::Info | Arun Agrawal | 2013-08-02 | 1 | -1/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #11455 from antonio/fix_enable_extension_not_being_defined | Rafael Mendonça França | 2013-08-02 | 3 | -0/+32 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Define enable_extension method to prevent undefined method error | |||||
| * | | | | | | | | Define enable_extension method to prevent undefined method error | Antonio Santos | 2013-08-02 | 3 | -0/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When mixing postgresql and another adapter like sqlite3 (for dev and test respectively), the task `db:test:prepare` will fail due to the `enable_extension` method not being defined in the abstract adapter. This patch simply adds an empty definition to prevent it. | |||||
* | | | | | | | | | Merge pull request #11718 from rShetty/patch-4 | Rafael Mendonça França | 2013-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix a gramatical mistake | |||||
| * | | | | | | | | | fix a gramatical mistake | Rajeev N Bharshetty | 2013-08-02 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Use assert_nil instead of testing for equality | Carlos Antonio da Silva | 2013-08-02 | 2 | -3/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #11714 from jetthoughts/11706_remove_bad_override_of_xml | Rafael Mendonça França | 2013-08-02 | 3 | -7/+47 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removed redundant xml override from pg adapter | |||||
| * | | | | | | | | | Removed redundant xml override from pg adapter | Paul Nikitochkin | 2013-08-02 | 3 | -7/+47 | |
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #11706 | |||||
* | | | | | | | | | Merge pull request #11717 from rajcybage/fix_map | Rafael Mendonça França | 2013-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | map => map! for stopping extra array creation | |||||
| * | | | | | | | | map => map! for stopping extra array creation | Rajarshi Das | 2013-08-02 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Use map! to avoid an extra object creation | Carlos Antonio da Silva | 2013-08-02 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Remove useless begin..end | Carlos Antonio da Silva | 2013-08-02 | 1 | -2/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #11713 from rajcybage/fix_changelog | Carlos Antonio da Silva | 2013-08-02 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fix changelog typos [ci skip] | |||||
| * | | | | | | | fix the changelog typo[ci skip] | Rajarshi Das | 2013-08-02 | 2 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | extract habtm handling to a method | Aaron Patterson | 2013-08-01 | 1 | -8/+12 | |
| | | | | | | | ||||||
* | | | | | | | use drop and avoid a range object | Aaron Patterson | 2013-08-01 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #11709 from yahonda/case_sensitive | Rafael Mendonça França | 2013-08-01 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | test_registering_new_handlers and test_count_on_invalid_columns_raises can be case insensitive | |||||
| * | | | | | | | Change test_registering_new_handlers and test_count_on_invalid_columns_raises | Yasuo Honda | 2013-08-02 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tesetcases assertion to case insensitive because Oracle database adapter handles table name in uppercase. | |||||
* | | | | | | | | Make current_page? compare binary strings | Rafael Mendonça França | 2013-08-01 | 2 | -3/+12 | |
|/ / / / / / / | ||||||
* | | | | | | | remove intermediate assignments | Aaron Patterson | 2013-08-01 | 2 | -7/+4 | |
| | | | | | | | ||||||
* | | | | | | | push option handling "chrome" outside `initialize` | Aaron Patterson | 2013-08-01 | 1 | -8/+7 | |
| | | | | | | | ||||||
* | | | | | | | remove `valid_options` class method | Aaron Patterson | 2013-08-01 | 1 | -4/+3 | |
| | | | | | | | ||||||
* | | | | | | | Enable rubinius on travis too | Rafael Mendonça França | 2013-08-01 | 1 | -0/+2 | |
| | | | | | | | ||||||
* | | | | | | | association builder classes no longer need the model | Aaron Patterson | 2013-08-01 | 3 | -8/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decouple the builder classes from the model. Builder objects should be easier to reuse now. | |||||
* | | | | | | | remove more mutations from the `build` method | Aaron Patterson | 2013-08-01 | 1 | -7/+2 | |
| | | | | | | | ||||||
* | | | | | | | make mutation method apis more consistent | Aaron Patterson | 2013-08-01 | 2 | -4/+5 | |
| | | | | | | | ||||||
* | | | | | | | push more mutations outside the factory method | Aaron Patterson | 2013-08-01 | 2 | -8/+6 | |
| | | | | | | | ||||||
* | | | | | | | push module building to the constructor | Aaron Patterson | 2013-08-01 | 1 | -14/+20 | |
| | | | | | | | ||||||
* | | | | | | | users should be warned if clobbering constants | Aaron Patterson | 2013-08-01 | 1 | -3/+1 | |
| | | | | | | | ||||||
* | | | | | | | no need to define the constant twice | Aaron Patterson | 2013-08-01 | 1 | -1/+0 | |
| | | | | | | | ||||||
* | | | | | | | this code is dead, removing | Aaron Patterson | 2013-08-01 | 1 | -6/+0 | |
| | | | | | | | ||||||
* | | | | | | | Allow jruby on travis allowing failures | Rafael Mendonça França | 2013-08-01 | 1 | -0/+4 | |
| | | | | | | | ||||||
* | | | | | | | defning extensions happens once, no need to cache | Aaron Patterson | 2013-08-01 | 1 | -5/+3 | |
| | | | | | | | ||||||
* | | | | | | | assert that constants have been set rather than the names | Aaron Patterson | 2013-08-01 | 2 | -9/+11 | |
| | | | | | | | ||||||
* | | | | | | | remove dead code | Aaron Patterson | 2013-08-01 | 1 | -4/+0 | |
| | | | | | | | ||||||
* | | | | | | | pushing out more callback definitions | Aaron Patterson | 2013-08-01 | 1 | -2/+6 | |
| | | | | | | |