Permalink
Switch branches/tags
Commits on Jul 16, 2014
  1. Fix testing define_mounted_helper

    drogus committed Jul 16, 2014
    Check for define_mounted_helper was added at 28cf772 and FakeEngine was
    created to test mounting an object with routes method which is not a
    RouteSet. In e6c602d FakeEngine was changed which allowed to remove
    define_mounted_helper check without breaking tests.
    
    In order to avoid such regressions here I create a different class for
    testing mounting inside a resource.
  2. Revert "routed applications will respond to these methods"

    drogus committed Jul 16, 2014
    This reverts commit 1ae9f05.
  3. Merge pull request #16197 from cgriego/patch-1

    rafaelfranca committed Jul 16, 2014
    Remove unused 1:1 association :remote option
  4. Remove unused 1:1 association :remote option

    cgriego committed Jul 16, 2014
    This option is unused, left over from pre-1.0 Rails to internally distinguish the location of the foreign key.
  5. Merge pull request #16196 from yahonda/mysql_restrict_test

    matthewd committed Jul 16, 2014
    Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"
  6. Merge pull request #16195 from jonatack/patch-7

    matthewd committed Jul 16, 2014
    Fix typos in string_ext_test.rb
  7. Use &= instead of select with include?

    rafaelfranca committed Jul 16, 2014
    The performance is almost the same with both implementations but this is
    clear.
    
    Before this patch:
    
    Calculating -------------------------------------
      small erb template      1452 i/100ms
    -------------------------------------------------
      small erb template    17462.1 (±13.3%) i/s -      85668 in   5.031395s
    .Calculating -------------------------------------
    small erb template with 1 partial
                               887 i/100ms
    -------------------------------------------------
    small erb template with 1 partial
                             8899.6 (±18.8%) i/s -      42576 in   5.009453s
    .Calculating -------------------------------------
    small erb template with 2 partials
                               666 i/100ms
    -------------------------------------------------
    small erb template with 2 partials
                             6821.5 (±8.8%) i/s -      33966 in   5.020791s
    
    After the patch:
    
    Calculating -------------------------------------
      small erb template      1479 i/100ms
    -------------------------------------------------
      small erb template    15956.6 (±7.6%) i/s -      79866 in   5.036001s
    .Calculating -------------------------------------
    small erb template with 1 partial
                               841 i/100ms
    -------------------------------------------------
    small erb template with 1 partial
                             9242.2 (±6.9%) i/s -      46255 in   5.029497s
    .Calculating -------------------------------------
    small erb template with 2 partials
                               615 i/100ms
    -------------------------------------------------
    small erb template with 2 partials
                             6524.7 (±6.8%) i/s -      32595 in   5.020456s
    
    You can find the benchmark code at
    https://gist.github.com/rafaelfranca/dee31120cfdb1ddc3b56
  8. Merge pull request #15917 from luke-gru/actionview_perf

    rafaelfranca committed Jul 16, 2014
    remove Set.new from DetailsKey::get, impacts rendering overhead
  9. Merge pull request #16190 from oss92/word_truncation

    matthewd committed Jul 16, 2014
    Word truncation
  10. extract inner options before delegating to the helper

    tenderlove committed Jul 16, 2014
    If we extract the options from the user facing method call ASAP, then we
    can simplify internal logic.
  11. Merge pull request #15944 from seuros/uuid

    rafaelfranca committed Jul 16, 2014
    Treat invalid uuid as nil
    
    Conflicts:
    	activerecord/CHANGELOG.md
  12. Merge pull request #16183 from goddamnhippie/fix-psych-warning

    rafaelfranca committed Jul 16, 2014
    Implement required #encode_with
  13. always transcode the file to utf-8

    tenderlove committed Jul 16, 2014
    people may be passing filenames to the constructor that are not utf-8,
    but they will assome that calling `original_filename` returns utf-8
    (because that's what it used to do).
  14. Merge pull request #15718 from chancancode/regression_from_15694

    chancancode committed Jul 16, 2014
    Fixed a regression introduced in 84cf156
  15. Merge branch 'joeljunstrom-local-iterator-for-partial-collections'

    rafaelfranca committed Jul 16, 2014
    Squash and merge #7698 doing some improvements to the original
    implementation.
  16. Add CHANGELOG entry for PartialIteration.

    rafaelfranca committed Jul 16, 2014
    Closes #7698.
  17. No need to have a file to PartialIteration class

    rafaelfranca committed Jul 16, 2014
    This class is only used on the PartialRenderer.
  18. Added PartialIteration class used when rendering collections

    joeljunstrom committed with rafaelfranca Sep 16, 2012
    The iteration object is available as the local variable
    "template_name_iteration" when rendering partials with collections.
    
    It gives access to the +size+ of the collection beeing iterated over,
    the current +index+ and two convinicence methods +first?+ and +last?+
    
    "template_name_counter" variable is kept but is deprecated.
    
    [Joel Junström + Lucas Uyezu]
  19. Remove unused fixtures

    rafaelfranca committed Jul 16, 2014
    These fixtures are not used in actionpack tests.
  20. Revert "Rename to test_mysql_strict_mode_disabled_dont_override_globa…

    yahonda committed Jul 16, 2014
    …l_sql_mode"
    
    This reverts commit babc24c.
    
    Conflicts:
    
    	activerecord/test/cases/adapters/mysql/connection_test.rb
    	activerecord/test/cases/adapters/mysql2/connection_test.rb
  21. nodoc enum hooks [ci skip]

    rafaelfranca committed Jul 16, 2014
  22. we intend to keep the `capture` helper for Active Record tests.

    senny committed Jul 16, 2014
    This is a follow up to f8f5cdc
  23. Active Record tests still depend on `capture`. Let's keep it for now.

    senny committed Jul 16, 2014
    This is a follow-up to 3121412
    
    /cc @rafaelfranca
    
    This will remove deprecation warnings from the PostgreSQL suite:
    
    ```
    DEPRECATION WARNING: #capture(stream) is deprecated and will be removed in the next release. (called from capture at /Users/senny/Projects/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb:89)
    /Users/senny/Projects/rails/activesupport/lib/active_support/core_ext/kernel/reporting.rb:89:in `capture'
      /Users/senny/Projects/rails/activerecord/test/cases/adapters/postgresql/composite_test.rb:73:in `ensure_warning_is_issued'
      /Users/senny/Projects/rails/activerecord/test/cases/adapters/postgresql/composite_test.rb:48:in `test_column'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:106:in `block (3 levels) in run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:204:in `capture_exceptions'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:103:in `block (2 levels) in run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:256:in `time_it'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:102:in `block in run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:317:in `on_signal'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:276:in `with_info_handler'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest/test.rb:101:in `run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:759:in `run_one_method'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:293:in `run_one_method'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:287:in `block (2 levels) in run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:286:in `each'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:286:in `block in run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:317:in `on_signal'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:306:in `with_info_handler'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:285:in `run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `block in __run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `map'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:149:in `__run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:126:in `run'
      /Users/senny/Projects/rails/.bundle/gems/minitest-5.3.3/lib/minitest.rb:55:in `block in autorun'
    ```
  24. Merge pull request #16187 from jone/testing-guide-assertions

    senny committed Jul 16, 2014
    Update assertion methods in testing guide [ci skip]
  25. document assert[_not]_empty, assert[_not]_includes, assert[_not]_pred…

    jone committed Jul 16, 2014
    …icate in testing guide.
  26. use foreign key DSL in our tests.

    senny committed Jul 16, 2014
  27. Merge pull request #16138 from sgrif/sg-attribute-set-key

    senny committed Jul 16, 2014
    AttributeSet#include? -> AttributeSet#key?