aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Using URI.parser.unescapeArun Agrawal2013-08-031-2/+2
| | | | | | Fixes warning warning: URI.unescape is obsolete
* Revert "Isolate railties Generators Tests"Guillermo Iguaran2013-08-021-1/+0
| | | | | This fixes railties tests in JRuby but break it in MRI This reverts commit fea99276c7024f183bf72a16ad9f36af4bae1d42.
* Merge pull request #11726 from atambo/isolate_generator_testsGuillermo Iguaran2013-08-021-0/+1
|\ | | | | Isolate railties Generators Tests
| * Isolate railties Generators TestsAlex Tambellini2013-08-021-0/+1
|/ | | | With this change jruby should pass all of the railties tests.
* add a test for concat on hm:t associationsAaron Patterson2013-08-021-0/+7
|
* Merge pull request #11721 from gaurish/join-timeoutGuillermo Iguaran2013-08-021-1/+1
|\ | | | | Add timeout to test_async_stream
| * Add timeout to test_async_streamGaurish Sharma2013-08-021-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_unlinkGuillermo Iguaran2013-08-021-0/+1
|\ \ | | | | | | Fix jruby warning when capture calls unlink on an open tempfile
| * | Fix jruby warning when capture calls unlink on an open tempfileAlex Tambellini2013-08-021-0/+1
|/ / | | | | | | Jruby cannot unlink a tempfile unless it is closed first.
* | Merge pull request #11712 from atambo/activesupport_testing_isolation_jrubyRafael Mendonça França2013-08-021-48/+4
|\ \ | | | | | | Fix ActiveSupport::Testing::Isolation on jruby
| * | Fix ActiveSupport::Testing::Isolation on jrubyAlex Tambellini2013-08-021-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-testRafael Mendonça França2013-08-021-2/+0
|\ \ \ | | | | | | | | As we are doing debug mode on
| * | | As we are doing debug mode onArun Agrawal2013-08-021-2/+0
| |/ / | | | | | | | | | we don't need to silenced it
* | | Merge pull request #11716 from ↵Carlos Antonio da Silva2013-08-021-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 apostrophePaul Nikitochkin2013-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | in getting started guide for section 5.6 [ci skip]
* | | | Merge pull request #11720 from arunagw/added-av-in-rails-infoGuillermo Iguaran2013-08-021-1/+1
|\ \ \ \ | | | | | | | | | | Added action_view in Rails::Info
| * | | | Added action_view in Rails::InfoArun Agrawal2013-08-021-1/+1
| | |/ / | |/| |
* | | | Merge pull request #11455 from antonio/fix_enable_extension_not_being_definedRafael Mendonça França2013-08-023-0/+32
|\ \ \ \ | | | | | | | | | | Define enable_extension method to prevent undefined method error
| * | | | Define enable_extension method to prevent undefined method errorAntonio Santos2013-08-023-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-4Rafael Mendonça França2013-08-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix a gramatical mistake
| * | | | | fix a gramatical mistakeRajeev N Bharshetty2013-08-021-1/+1
| | | | | |
* | | | | | Use assert_nil instead of testing for equalityCarlos Antonio da Silva2013-08-022-3/+2
|/ / / / /
* | | | | Merge pull request #11714 from jetthoughts/11706_remove_bad_override_of_xmlRafael Mendonça França2013-08-023-7/+47
|\ \ \ \ \ | | | | | | | | | | | | Removed redundant xml override from pg adapter
| * | | | | Removed redundant xml override from pg adapterPaul Nikitochkin2013-08-023-7/+47
| | |/ / / | |/| | | | | | | | | | | | | Closes: #11706
* | | | | Merge pull request #11717 from rajcybage/fix_mapRafael Mendonça França2013-08-021-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | map => map! for stopping extra array creation
| * | | | map => map! for stopping extra array creationRajarshi Das2013-08-021-1/+1
|/ / / /
* | | | Use map! to avoid an extra object creationCarlos Antonio da Silva2013-08-021-1/+1
| | | |
* | | | Remove useless begin..endCarlos Antonio da Silva2013-08-021-2/+1
| | | |
* | | | Merge pull request #11713 from rajcybage/fix_changelogCarlos Antonio da Silva2013-08-022-2/+2
|\ \ \ \ | |/ / / |/| | | Fix changelog typos [ci skip]
| * | | fix the changelog typo[ci skip]Rajarshi Das2013-08-022-2/+2
|/ / /
* | | extract habtm handling to a methodAaron Patterson2013-08-011-8/+12
| | |
* | | use drop and avoid a range objectAaron Patterson2013-08-011-1/+1
| | |
* | | Merge pull request #11709 from yahonda/case_sensitiveRafael Mendonça França2013-08-012-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_raisesYasuo Honda2013-08-022-2/+2
| | | | | | | | | | | | | | | | | | | | tesetcases assertion to case insensitive because Oracle database adapter handles table name in uppercase.
* | | | Make current_page? compare binary stringsRafael Mendonça França2013-08-012-3/+12
|/ / /
* | | remove intermediate assignmentsAaron Patterson2013-08-012-7/+4
| | |
* | | push option handling "chrome" outside `initialize`Aaron Patterson2013-08-011-8/+7
| | |
* | | remove `valid_options` class methodAaron Patterson2013-08-011-4/+3
| | |
* | | Enable rubinius on travis tooRafael Mendonça França2013-08-011-0/+2
| | |
* | | association builder classes no longer need the modelAaron Patterson2013-08-013-8/+7
| | | | | | | | | | | | | | | decouple the builder classes from the model. Builder objects should be easier to reuse now.
* | | remove more mutations from the `build` methodAaron Patterson2013-08-011-7/+2
| | |
* | | make mutation method apis more consistentAaron Patterson2013-08-012-4/+5
| | |
* | | push more mutations outside the factory methodAaron Patterson2013-08-012-8/+6
| | |
* | | push module building to the constructorAaron Patterson2013-08-011-14/+20
| | |
* | | users should be warned if clobbering constantsAaron Patterson2013-08-011-3/+1
| | |
* | | no need to define the constant twiceAaron Patterson2013-08-011-1/+0
| | |
* | | this code is dead, removingAaron Patterson2013-08-011-6/+0
| | |
* | | Allow jruby on travis allowing failuresRafael Mendonça França2013-08-011-0/+4
| | |
* | | defning extensions happens once, no need to cacheAaron Patterson2013-08-011-5/+3
| | |
* | | assert that constants have been set rather than the namesAaron Patterson2013-08-012-9/+11
| | |