aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* use correct variable in BacktraceCleaner testyuuji.yaginuma2016-11-261-1/+1
| | | | `@target_dir` variable was changed to local variable in 8e1714b.
* Merge pull request #27140 from ↵Rafael França2016-11-252-1/+19
|\ | | | | | | | | supercaracal/fix-force-ssl-if-session-store-disabled Fix a force ssl redirection bug that occur when session store disabled.
| * Remove aggressive unit test with mock. And add integration level test.Taishi Kasuga2016-11-242-1/+19
| |
* | [ci skip] `MiniTest` -> `Minitest`Fumiaki MATSUSHIMA2016-11-241-1/+1
| | | | | | | | | | | | MiniTest was renamed to Minitest. Already renamed on https://github.com/rails/rails/pull/13366 But slipped into on https://github.com/rails/rails/pull/18413/files#diff-6bb90a693835b0e92910b796c8b0ef59R27
* | Add CHANGELOG entryGuillermo Iguaran2016-11-211-0/+5
| |
* | Don't add jQuery by default in new apps and use rails-ujs as UJS adapter insteadGuillermo Iguaran2016-11-215-18/+20
|/
* deep symbolize keys on secrets.ymlIsaac Sloan2016-11-213-2/+22
|
* Pass `rails runner` args onto file again.Kasper Timm Hansen2016-11-202-1/+10
| | | | | | | | | When making the new command insfrastructure I had missed that `bin/rails runner some_file.rb some args` would pass the extra args onto the file in `ARGV`. Now fixed by allowing the command to take extra args again, and make sure to remove the file name from `ARGV`.
* Use existing --skip-turbolinks option for conditionals instead of checking ↵Guillermo Iguaran2016-11-192-2/+2
| | | | if turbolinks is present in gemfile list
* Merge pull request #27106 from prathamesh-sonpatki/add-missing-testEileen M. Uchitelle2016-11-191-0/+20
|\ | | | | Add missing test for singular resource output in rake routes
| * Add missing test for singular resource output in rake routesPrathamesh Sonpatki2016-11-191-0/+20
| | | | | | | | | | | | | | | | - This test was present in https://github.com/rails/rails/pull/27089 but not present on master, may be removed in merge commit? - There was discussion about moving this to `application/rake_test` so may be this happened in merge commit. - https://github.com/rails/rails/pull/27089#discussion_r88731157
* | move CHANGELOG entry to the appropriate file [ci skip]yuuji.yaginuma2016-11-191-6/+0
|/ | | | Follow up to #27098
* Merge pull request #27089 from erickueen/erickueen_fix_26606Rafael Mendonça França2016-11-181-3/+3
|\ | | | | | | Fix incorrect output from rails routes when using singular resources …
| * Fix incorrect output from rails routes when using singular resources issue ↵Erick Reyna2016-11-182-3/+36
| | | | | | | | | | | | | | | | | | | | #26606 Rails routes (even rake routes in previous versions) output showed incorrect routes when an application use resource :controller, implying that edit_controller_path match with controller#show. The order of the output has changed to correct this. View #26606 for more information. Added a test case, change unit test in rake to expect the new output. Since the output of resource :controller is changing, the string spected of the railties/test/application/rake_test.rb test_rails_routes_with_controller_environment had to be modified.
* | Merge pull request #27092 from prathamesh-sonpatki/https-source-bundlerRafael França2016-11-181-0/+5
|\ \ | | | | | | Use secure source for gems referencing "github" in the generated apps
| * | Use secure source for gems referencing "github" in the generated appsPrathamesh Sonpatki2016-11-181-0/+5
| |/ | | | | | | | | | | | | - New apps generated on master and latest bundler give warning about "github" source being insecure. - Use the same solution used for Rails master in the generated app's Gemfile to fix this issue.
* / Fix `ActionDispatch::IntegrationTest#open_session`Tawan Sierek2016-11-181-0/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset a new session directly after its creation in `ActionDispatch::IntegrationTest#open_session`. Reset the session to a clean state before making it available to the client's test code. Issue #22742 reports unexpected behavior of integration tests that run multiple sessions. For example an `ActionDispatch::Flash` instance is shared across multiple sessions, though a client code will rightfully assume that each new session has its own flash hash. The following test failed due to this behavior: class Issue22742Test < ActionDispatch::IntegrationTest test 'issue #22742' do integration_session # initialize first session a = open_session b = open_session refute_same(a.integration_session, b.integration_session) end end Instead of creating a new `ActionDispatch::Integration::Session` instance, the same instance is shared across all newly opened test sessions. This is due to the way how new test sessions are created in `ActionDispatch::IntegrationTest#open_session`. The already existing `ActionDispatch::IntegrationTest` instance is duplicated with `Object#dup`, This approach was introduced in commit 15c31c7639b. `Object#dup` copies the instance variables, but not the objects they reference. Therefore this issue only occurred when the current test instance had been tapped in such a way that the instance variable `@integration_session` was initialized before creating the new test session. Close #22742 [Tawan Sierek + Sina Sadeghian]
* Add `:skip_sprockets` to `Rails::PluginBuilder::PASSTHROUGH_OPTIONS`Tsukuru Tanimichi2016-11-143-1/+13
| | | | | | | | | | | | `rails plugin new` with `--full` and `--skip-sprockets` options generates a dummy application that throws `NoMethodError`. ``` % rails plugin new my_engine -S --full --skip-gemspec % cd my_engine % bin/rails test rails aborted! NoMethodError: undefined method `assets' for #<Rails::Application::Configuration:0x007f83aa1e6100> ```
* Merge pull request #26905 from bogdanvlviv/docsAndrew White2016-11-131-2/+2
|\ | | | | Add missing `+` around a some literals.
| * Add missing `+` around a some literals.bogdanvlviv2016-10-271-2/+2
| | | | | | | | | | | | Mainly around `nil` [ci skip]
* | Add test for #25248Sean Griffin2016-11-121-0/+10
| |
* | Merge pull request #25248 from bluesh55:features/skip-coffeeSean Griffin2016-11-121-1/+6
|\ \ | | | | | | | | | Add --skip-coffee generating option
| * | Add --skip-coffee generating optionseunghwan oh2016-06-021-1/+6
| | | | | | | | | | | | | | | | | | Usage `rails new awesome-project --skip-coffee`
* | | remove unused requireyuuji.yaginuma2016-11-051-3/+0
| | | | | | | | | | | | YAML and ERB were removed at 971d510
* | | Use tr instead of gsubAkira Matsuda2016-11-021-1/+1
| | |
* | | remove warning from railtieyuuji.yaginuma2016-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warnings. ```ruby rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @load_console not initialized rails/railties/lib/rails/railtie.rb:186: warning: instance variable @rake_tasks not initialized ```
* | | Make `register_block_for` privateArthur Neves2016-11-011-11/+11
| | |
* | | Don't put db:migrate and db:setup in binfiles if activerecord is excludedBouke van der Bijl2016-11-013-0/+10
| | |
* | | Merge PR #26052Arthur Neves2016-11-011-12/+16
|\ \ \
| * | | Added register_block method to register rake_tasks, generators, console & ↵Rafael Fidelis2016-11-011-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runner blocks fixing @generators var initialization pre initializing variables values Changing from var init to symbol to instance var get/set
* | | | Add more rubocop rules about whitespacesRafael Mendonça França2016-10-2935-88/+88
| | | |
* | | | Revert "Merge pull request #23698 from ↵Rafael Mendonça França2016-10-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | meinac/add_missing_types_into_ar_model_generator_usage" This reverts commit aaf561d26cf9a879ff40190b625155015c6225da, reversing changes made to 83776676e54b387fc52081ff31cfd7710bae9e03. Reason: It is not a good idea to connect to the database on generators
* | | | Merge pull request #23698 from ↵Arthur Nogueira Neves2016-10-281-11/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | meinac/add_missing_types_into_ar_model_generator_usage Dynamically show available sql types [ci skip]
| * | | | Dynamically show available sql types [ci skip]Mehmet Emin İNAÇ2016-02-161-11/+1
| | | | | | | | | | | | | | | | | | | | Dynamically list available sql data types based on current database adapter.
* | | | | Hide commands from API site.Kasper Timm Hansen2016-10-2813-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | They're just barren on the site and confure more than guide, instead rely on the built in --help to guide users.
* | | | | Explicitly show --no-helper and --no-assets options in help messageAkira Matsuda2016-10-281-0/+2
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | I'm sorry for causing #24168. I wasn't aware of --no-helper and --no-assets. So I'm adding them to the help message. I'm still not sure how to show `--no-test-framework` though.
* | | | remove assets config from `new_framework_defaults` if `--skip-sprockets` is trueyuuji.yaginuma2016-10-252-0/+5
| | | | | | | | | | | | | | | | If `sprockets` is not loaded, `Rails.application.config.assets` is not defined.
* | | | Use `on_load` to trigger commandline processing codeAaron Patterson2016-10-212-5/+8
| | | | | | | | | | | | | | | | We need to use on_load so that plugins will get the same functionality
* | | | Prevent the test framework from being loaded in production modeAaron Patterson2016-10-213-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test framework should not be autoloaded in production mode. Before this commit, the testing railtie would extend AS::TestCase. This caused AS::TestCase to be preloaded regardless of the environment in which we were running. This commit just moves the code that adds line filtering support in to the test command where we actually execute the test runner. That allows us to maintain the line runner feature but only load the minimal amount of code we need.
* | | | don't create db directory when skip active_recordJosé Gomes Júnior2016-10-212-0/+2
| | | |
* | | | Remove deprecated code in ssl middlewareRafael Mendonça França2016-10-101-2/+2
| | | |
* | | | Remove deprecated support to :text in renderRafael Mendonça França2016-10-1010-69/+69
| | | |
* | | | Allow the use of listen's 3.1.x branch.Esteban Santana Santana2016-10-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | When the initial evented monitor feature was written, the latest version of listen was the 3.0.x series. Since then the listen project has moved on to the 3.1.x series. This patch allows the use of the new versions.
* | | | remove `mongrel` once againyuuji.yaginuma2016-09-291-1/+1
| | | | | | | | | | | | | | | | `mongrel` was removed in #26408. But have back accidentally in #26414.
* | | | use `active_support/testing/autorun` in `bin/test` scriptyuuji.yaginuma2016-09-272-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 29f0fbd5db643b885665e4a14c7de3bf6c0d9c96 has changed that always call `Minitest.autorun` in `active_support/testing/autorun`. Therefore, when used directly `Minitest.run`, tests are performed twice.
* | | | Merge pull request #26414 from rails/rails-commandsKasper Timm Hansen2016-09-2638-766/+1005
|\ \ \ \ | | | | | | | | | | Initial Rails Commands Infrastructure
| * | | | Apply test command changes.Kasper Timm Hansen2016-09-261-1/+3
| | | | |
| * | | | Fix server command tests.Kasper Timm Hansen2016-09-251-1/+2
| | | | |
| * | | | Fix dbconsole tests.Kasper Timm Hansen2016-09-252-28/+59
| | | | |
| * | | | Apply Rafaels review fixes.Kasper Timm Hansen2016-09-253-3/+4
| | | | |