Commit Graph

50516 Commits

Author SHA1 Message Date
Kir Shatrov
487aa51b14 Suggest new hash syntax in testing guide 2015-03-31 14:38:28 +03:00
yui-knk
65200a38b9 [ci skip] Remove unnecessary > 2015-03-31 20:10:12 +09:00
Kir Shatrov
3cee8ce2e8 Don't suggest bin/rails test controllers 2015-03-31 13:45:17 +03:00
Hendy Tanata
b016533d5b Add missing "of" to testing guide. 2015-03-30 09:15:54 -07:00
Matthew Draper
ffd2f085a5 Merge branch 'kirs' 2015-03-30 17:06:09 +10:30
Kir Shatrov
09d2623783 Switch to bin/rails test in testing guide
rails/rails#18305
2015-03-30 00:11:02 +03:00
Vijay Dev
c26ee64b92 Merge branch 'master' of github.com:rails/docrails
Conflicts:
	guides/source/4_0_release_notes.md
2015-03-26 16:22:41 +00:00
Arthur Nogueira Neves
8635706ba3 Merge pull request #19521 from mudphone/test_fixture_docs
[skip ci] Minor edits for clarity in the test fixture guide.
2015-03-25 22:38:29 -04:00
Kyle Oba
138180252d [skip ci] Minor edits for clarity, to make smooth, & separate clauses.
* Add conjunction for clarity.
* Add comma between independent clauses: create command, and generation
  of fixtures.
2015-03-25 16:04:57 -10:00
Kasper Timm Hansen
348377da4d Merge pull request #19496 from andreynering/docs-migrations-change
Documenting remove_column as a reversible migration method
2015-03-25 13:53:23 +01:00
Andrey Nering
4b87780abc Documenting remove_column as a reversible migration method [ci skip] 2015-03-25 09:16:08 -03:00
Yves Senn
30a5cd9c8b Merge pull request #19503 from jasoncodes/no-psqlrc
Avoid loading user's psqlrc when loading test structure
2015-03-25 09:42:45 +01:00
Kasper Timm Hansen
0f76ea63e1 Merge pull request #19507 from jonatack/ar-validations-guide-fixes
[skip ci] Active Record Validations guide fixes
2015-03-25 09:06:49 +01:00
Jon Atack
616f9a8fdb [ci skip] Active Record Validations guide fixes
- Remove deprecated `[]=`

- Fix duplicate `errors#add` example. The second code example was
originally `[]=`, replace it with `[] <<`.

- Improve explanations for `errors#add` and `errors#full_messages`

Follow-up to PR #19457 (closed after borking my git history). Apologies
for the duplicate PR.

cc @kaspth
2015-03-25 13:30:41 +05:30
yui-knk
194edcf67e [ci skip] Fix &> with %> 2015-03-25 13:22:40 +09:00
Claudio B.
5c0266dd1d Merge pull request #19504 from y-yagi/fix_digest_explain
update `config.assets.digest` default value in guides [ci skip]
2015-03-24 20:14:43 -07:00
yuuji.yaginuma
df280c4316 update config.assets.digest default value in guides [ci skip] 2015-03-25 09:17:12 +09:00
Jason Weathered
78fb8bb7e1 Avoid loading user's psqlrc when loading test structure 2015-03-25 09:21:16 +10:00
Rafael Mendonça França
e5fda36d8a Merge pull request #19502 from kaspth/assert-select-failure-output
[ci skip] Update 4.2 Release notes with more assert_select information.
2015-03-24 17:27:30 -03:00
Kasper Timm Hansen
c8ca20f7a0 [ci skip] Update 4.2 Release notes with more assert_select information.
Adds documentation for substitutions and why Regexp substitions look different
when assertion fails.
2015-03-24 21:25:38 +01:00
Arthur Nogueira Neves
37296aa833 Merge pull request #19499 from swalkinshaw/patch-1
Update ActiveSupport::Subscriber docs
2015-03-24 15:55:44 -04:00
Arthur Neves
b6b088429c Add changelog entry for #19271 2015-03-24 15:12:47 -04:00
Rafael Mendonça França
d024bad4d1 Revert "Merge pull request #19500 from ccutrer/dry_sti_subclass_finding"
This reverts commit 5cfa6a8ab997089c3012a82052c8c317b2e095f5, reversing
changes made to bfd5bf8313e6ea0bb2eccb68ee5076bb63f0b2db.

Reason: This broken travis build.
2015-03-24 14:12:24 -03:00
Rafael Mendonça França
5cfa6a8ab9 Merge pull request #19500 from ccutrer/dry_sti_subclass_finding
DRY up STI subclass logic
2015-03-24 13:42:00 -03:00
Cody Cutrer
7be08818a9 DRY up STI subclass logic
the newer method used for discriminating new records did not
use the older and more robust method used for instantiating
existing records, but did have a better post-check to ensure
the sublass was in the hierarchy. so move the descendants check
to find_sti_class, and then simply call find_sti_class from
subclass_from_attributes
2015-03-24 09:22:46 -06:00
Scott Walkinshaw
25b3f738e4 Update ActiveSupport::Subscriber docs
For consistency purposes with the changes done in https://github.com/rails/rails/pull/12285
2015-03-24 11:10:15 -04:00
Juanito Fatas
55f135f131 Rails 5 requires 2.2.1. [ci skip]
Follow up of https://github.com/rails/rails/pull/19263.
2015-03-24 20:19:14 +08:00
Carlos Antonio da Silva
bfd5bf8313 Merge pull request #19452 from pinglamb/fix-referencing-wrong-alias-when-joining-tables-of-has-many-through-association
Fix referencing wrong aliases while joining tables of has many through association
2015-03-24 08:00:59 -03:00
Yves Senn
6a02efcfe5 Merge pull request #19493 from larskanis/add_infinity_test
PostgreSQL, Add test case for "Infinity" string assignment to float columns
2015-03-24 10:13:43 +01:00
Yves Senn
41e6302cce Merge pull request #19488 from yui-knk/fix/comment2
[ci skip] Remove unacceptable method name
2015-03-24 08:56:01 +01:00
Yves Senn
ef2bff0284 Merge pull request #19491 from tgxworld/fix_incorrect_description
Fix incorrect description for `assert_nothing_raised`. [ci skip]
2015-03-24 08:52:38 +01:00
Guo Xiang Tan
ea5e3192d5 Fix incorrect description for assert_nothing_raised. 2015-03-24 15:32:13 +08:00
yui-knk
dbc7acd8ef [ci skip] Remove unacceptable method name 2015-03-24 13:23:12 +09:00
Rafael Mendonça França
639159cebe Merge pull request #19485 from tgxworld/small_doc_fix
Small doc fix. [CI SKIP]
2015-03-24 00:15:30 -03:00
Guo Xiang Tan
874616a905 Small doc fix. [CI SKIP] 2015-03-24 11:11:35 +08:00
Arthur Nogueira Neves
2f14153a53 Merge pull request #19481 from davidcornu/activesupport/normalize-to-sentence
Make sure Array#to_sentence always returns a String
2015-03-23 20:07:42 -04:00
yui-knk
c4a3a6da09 [ci skip] Change to a singular form (the comment model) 2015-03-24 08:48:11 +09:00
Rafael Mendonça França
503d9e1288 Merge pull request #19482 from mperham/master
Pass wrapped class name to Sidekiq for logging purposes
2015-03-23 20:04:08 -03:00
Mike Perham
8d2b1406bc Pass wrapped class name to Sidekiq for logging purposes
Sidekiq logs the name of the job class being performed.  Because
ActiveJob wraps the class, this means every job logs as an AJ::JobWrapper
instead of the actual class name.

Will help fix mperham/sidekiq#2248
2015-03-23 15:16:07 -07:00
David Cornu
a64f3e4195 Make sure Array#to_sentence always returns a String 2015-03-23 15:47:37 -04:00
Rafael Mendonça França
4a0f314d8a Merge pull request #19475 from tgxworld/no_one_has_to_suck_anymore
Remove alias for `i_suck_and_my_tests_are_order_dependent`.
2015-03-23 13:35:12 -03:00
Guo Xiang Tan
5a973b314b Remove alias for i_suck_and_my_tests_are_order_dependent. 2015-03-24 00:27:53 +08:00
Andrew White
550c1f0950 Fix failing tests for #19474 2015-03-23 13:15:59 +00:00
Ryan Tomayko
0b81b3094a Fix ActionDispatch::PublicExceptions returning string rack status
The status returned in the rack [status, headers, body] array was
a string, which can cause problems with middleware that assumes the
status will be a Fixnum. This likely never surfaced because other
middleware to_i the status returned from downstream apps before
passing it on.
2015-03-23 13:15:59 +00:00
Yves Senn
f768cb07e6 Merge pull request #19473 from nerdinand/duration-to_i-documentation
Add documentation for Duration#to_i for clarification
2015-03-23 13:39:28 +01:00
nerdinand
38c833cadd Add documentation for Duration#to_i for clarification 2015-03-23 13:29:44 +01:00
Yves Senn
ec9c8a33b2 Merge pull request #19471 from nerdinand/remove-activesupport-integer-example-doc
Remove reference to Numeric#from_now, as it is no longer supported [ci skip]
2015-03-23 11:10:11 +01:00
nerdinand
bbdd20cfeb Remove reference to Numeric#from_now, as it is no longer supported 2015-03-23 11:08:02 +01:00
Rafael Mendonça França
ca5a35da37 Merge pull request #19449 from Gaurav2728/gaurav-unavailable_link
remove old unavailable link with relevant fix patch 1
2015-03-23 03:08:41 -03:00
Rafael Mendonça França
ab9a893842 Merge pull request #19469 from Gaurav2728/gaurav-mysql_missing_links
update mysql link that has been replaced
2015-03-23 03:08:23 -03:00