aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
Commit message (Collapse)AuthorAgeFilesLines
* Fix rails/info routes for apps with globbing routeNicholas Firth-McCoy2016-06-201-0/+19
| | | | | | | | The /rails/info routes were inaccessible in apps with a catch-all globbing route, as they were being appended after the globbing route and would never be matched. See also ccc3ddb7762bae0df7e2f8d643b19b6a4769d5be.
* Fix failing railties testsPrathamesh Sonpatki2016-06-181-2/+2
| | | | | | | | | | - Railties tests related to fetching asset URL started failing after the release of sprockets 3.6.1 on Travis. - This was due to the change in https://github.com/rails/sprockets/pull/311/files which changed the logic in `concat_javascript_sources` to add `;` at the end of file if the source did not end with semicolon. - Bumped up sprockets minor version and fixed the failing tests.
* Merge pull request #25390 from gsamokovarov/abstact-unit-presence-requireRafael França2016-06-131-0/+1
|\ | | | | Require "active_support/core_ext/object/blank" for railties abstract unit
| * Require "active_support/core_ext/object/blank" for railties abstract unitGenadi Samokovarov2016-06-131-0/+1
| | | | | | | | | | | | | | | | | | In #25380 I moved an `active_support/core_ext/object/blank` in the `activesupport/lib/active_support/testing/assertions.rb`, however it caused a chain reaction, resulting in failing railties tests. Moving the require to `railties/test/isolation/abstract_unit.rb` and `activesupport/test/abstract_unit.rb`.
* | Merge pull request #25319 from morgoth/generate-application-record-firstRafael França2016-06-134-18/+18
|\ \ | |/ |/| Generate application_record.rb file before model file
| * Generate application_record.rb file before model fileWojciech Wnętrzak2016-06-084-18/+18
| | | | | | | | | | | | Previously model file was generated first, which resulted in inheriting from `ActiveRecord::Base`, but since application_record.rb is generated as well, it should already be used.
* | Merge pull request #25004 from ↵Eileen M. Uchitelle2016-06-122-0/+23
|\ \ | | | | | | | | | | | | y-yagi/generate_mailer_layout_files_if_it_does_not_already_exist generate mailer layout files if it does not already exist
| * | generate mailer layout files if it does not already existyuuji.yaginuma2016-05-152-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if `ApplicationMailer` does not exist, it is generated when run the mailer generator, but layouts files does not generate. However, because it uses the layouts in `ApplicationMailer`, layouts are required. Follow up to #24161
* | | Prevent `{ internal: true }` from being stored in the routerJon Moss2016-06-071-0/+6
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgotten followup to #23669 :grimacing: If you went to an internal route (e.g. `/rails/info/routes`), you would previously see the following in your logger: ```bash Processing by Rails::InfoController#routes as HTML Parameters: {"internal"=>true} Rendering /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application Rendered collection of /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb [2 times] (10.5ms) Rendered /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb (2.5ms) Rendered /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application (23.5ms) Completed 200 OK in 50ms (Views: 35.1ms | ActiveRecord: 0.0ms) ``` Now, with this change, you would see: ```bash Processing by Rails::InfoController#routes as HTML Rendering /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application Rendered collection of /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb [2 times] (1.6ms) Rendered /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb (10.2ms) Rendered /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application (17.4ms) Completed 200 OK in 44ms (Views: 28.0ms | ActiveRecord: 0.0ms) ```
* | Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-testsKasper Timm Hansen2016-06-071-2/+2
|\ \ | | | | | | Fix API controller tests by assigning them the encoding type
| * | Fix API controller tests by assigning them the encoding typePrathamesh Sonpatki2016-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | - Fixes #25183. - The `as: :json` feature was added in https://github.com/rails/rails/pull/21671 and recommended to use for JSON endpoints so let's use it by default for API controller tests.
* | | Merge pull request #25247 from y-yagi/reference_actual_classKasper Timm Hansen2016-06-071-1/+1
|\ \ \ | |/ / |/| | reference actual class to use middleware
| * | reference actual class to use middlewareyuuji.yaginuma2016-06-021-1/+1
| | | | | | | | | | | | Using strings for middleware class names is deprecated in 83b767cef90abfc4c2ee9f4b451b0215501fae9a.
* | | Remove FORCE option as it was only needed for testsPrathamesh Sonpatki2016-06-071-1/+3
| | | | | | | | | | | | - Adjusted tests instead.
* | | Fix minor regression about old apps not getting per_form_csrf and ↵Prathamesh Sonpatki2016-06-041-17/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | request_forgery_protection configs - Earlier per_form_csrf_tokens and request_forgery_protection config files were generated for old apps upgraded to Rails 5. - But when we collapsed all initializers into one file, the entire file does not get created for old apps. - This commit fixes it and also changes values for all new defaults for old apps so that they will not break. - Also added a test for `rails app:update`.
* | Collapse all new default initializers into a single filePrathamesh Sonpatki2016-05-312-93/+19
| | | | | | | | | | | | - Adjusted tests also for this new behavior. - Based on the discussion in https://github.com/rails/rails/pull/25184#issuecomment-222454583.
* | Move new default initializers into separate directoryPrathamesh Sonpatki2016-05-283-20/+20
| | | | | | | | | | | | - These initializers are new defaults for Rails 5 and newly generated apps do not need to change them. - Fixes #25181
* | Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | Follow up to e45f388.
* | Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing the generated integration tests to assert redirects with an absolute path this redirection check in `assert_redirected_to` against the absolute response location would now pass: https://github.com/rails/rails/blob/af245aaf3a1c447752a1b5895adddc66e5f73c00/actionpack/lib/action_dispatch/testing/assertions/response.rb#L55 Thus we'd break early instead of hitting `assert_operator` and have 2 fewer assertions per `assert_redirected_to` as `assert_operator` is composed of 2 assertions internally: https://github.com/seattlerb/minitest/blob/4e146b1515b19a5c474e39c174b037510f6dbc6e/lib/minitest/assertions.rb#L254-L258 Deduct 2 assertions for 2 redirects taking the expected count down by 4 in total for the two failing tests.
* | Remove public/ files for API appsPrathamesh Sonpatki2016-05-281-1/+7
| | | | | | | | - Fixes #25180
* | Added a shared section to config/secrets.yml that will be loaded for all ↵David Heinemeier Hansson2016-05-211-0/+25
| | | | | | | | environments
* | Merge pull request #24918 from prathamesh-sonpatki/cable-assetsRafael França2016-05-211-4/+20
|\ \ | | | | | | Cable: Generate .js or .coffee files while generating channel as per the javascript engine of the application
| * | Cable: Generate .js or .coffee files while generating channel as per the ↵Prathamesh Sonpatki2016-05-171-4/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javascript engine of the application - Now we will detect what javascript engine user is using and based on that we will generate either `.js` or `.coffee` version of the channel file. - This also needs a change in coffee-rails to override the `js_template` method. Related PR https://github.com/rails/coffee-rails/pull/72. - Currently coffee-rails gem sets `config.app_generators.javascript_engine` to `:coffee` and using this information we override the `js_template` to set the extension as `.coffee` in coffee-rails gem. - Using this approach, we can keep the `channel.js` and `channel.coffee` files in the Rails repository itself. - Additionally the `js_template` method can act as public interface for coffee-rails gem to hook into and change the extension to `.coffee` without maintaining the actual asset files. [Prathamesh Sonpatki, Matthew Draper]
* / `md5` --> `MD5`Jon Moss2016-05-171-1/+1
|/ | | | | Sorry, I missed a few places in my last PR. This should be the last of 'em :grimacing:
* Fix etag expectation to work with the SHA256Rafael Mendonça França2016-05-061-1/+1
| | | | It is related with https://github.com/rack/rack/commit/7b66d2cdb80a4d6b44fa8c61d92e25fbbda1f152
* Fix some typos in comments.Joe Rafaniello2016-05-041-1/+1
| | | | [ci skip]
* Merge pull request #24696 from y-yagi/remove_unnessary_option_settingKasper Timm Hansen2016-04-252-0/+19
|\ | | | | remove unnessary option setting from test runner
| * register rake options to `OptionParser`yuuji.yaginuma2016-04-251-0/+11
| | | | | | | | | | In order to prevent `OptionParser::ParseError` when specify the rake options to `routes` task.
| * remove unnessary option setting from test runneryuuji.yaginuma2016-04-251-0/+8
| | | | | | | | | | | | | | If run the test over the `rake` command, because of the test patterns is passed via `rake_run` method, do not need to be obtained from the argv. This probably fixes #24372.
* | Fix broken build, channel files are also included in `bin/rails stats` nowPrathamesh Sonpatki2016-04-241-2/+2
| | | | | | | | - Followup of https://github.com/rails/rails/pull/24709.
* | Add compatibility for Ruby 2.4 `to_time` changesAndrew White2016-04-231-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 2.4 the `to_time` method for both `DateTime` and `Time` will preserve the timezone of the receiver when converting to an instance of `Time`. Since Rails 5.0 will support Ruby 2.2, 2.3 and later we need to introduce a compatibility layer so that apps that upgrade do not break. New apps will have a config initializer file that defaults to match the new Ruby 2.4 behavior going forward. For information about the changes to Ruby see: https://bugs.ruby-lang.org/issues/12189 https://bugs.ruby-lang.org/issues/12271 Fixes #24617.
* | Fix test nameVipul A M2016-04-231-1/+1
|/
* - using rails dev:cache instead of rake dev:cacheMohit Natoo2016-04-221-1/+1
|
* Fixed assertions with regex used in dbs testsVipul A M2016-04-191-2/+2
|
* Merge pull request #24551 from bogdanvlviv/notice_for_tasksJeremy Daer2016-04-172-2/+4
|\ | | | | Added notice when a database is successfully created or dropped.
| * Added notice when a database is successfully created or dropped.bogdanvlviv2016-04-172-2/+4
| |
* | don't remove `cable.js`yuuji.yaginuma2016-04-161-0/+12
|/ | | | `cable.js` is required for other Channels.
* Generate `cable.js` file if does not exist when generating channelPrathamesh Sonpatki2016-04-121-0/+8
| | | | | | | | | - Before this, while generating a channel, we were not creating `cable.js` if it does not already exist. - We have similar code for application mailer here - https://github.com/rails/rails/commit/0b3ae023d27197417541932632055cd6be4810c4. - Based on the comment - https://github.com/rails/rails/issues/24418#issuecomment-205421995.
* do not create unnecessary directoryyuuji.yaginuma2016-04-101-2/+1
| | | | | | This was added in a4c358f, but `config.assets` has been removed in 5172d93. Also, do not use env path to `Sprockets::Cache::FileStore` even `sprockets-rails`. ref: https://github.com/rails/sprockets-rails/blob/master/lib/sprockets/railtie.rb#L129
* Merge pull request #24165 from y-yagi/generate_application_job_when_not_existEileen M. Uchitelle2016-04-092-0/+20
|\ | | | | generate ApplicationJob if it does not already exist
| * generate ApplicationJob if it does not already existyuuji.yaginuma2016-03-252-0/+20
| | | | | | | | | | | | ActiveJob jobs now inherit from ApplicationJob by default. However, when updating to Rails 5 from the old Rails, since there is a possibility that ApplicationJob does not exist.
* | Use new hash syntax (#24464)Jeroen Visser2016-04-081-2/+2
| | | | | | | | | | | | * Updated syntax * Updated tests to match syntax
* | Fix rails restart issue with PumaPrathamesh Sonpatki2016-03-303-0/+32
|/ | | | | | | | | | | | | | | - We need to pass the restart command to Puma so that it will use it while restarting the server. - Also made sure that all the options passed by user while starting the server are used in the generated restart command so that they will be used while restarting the server. - Besides that we need to remove the server.pid file for the previous running server because otherwise Rack complains about it's presence. - We don't care if the server.pid file does not exist. We only want to delete it if it exists. - This also requires some changes on Puma side which are being tracked here - https://github.com/puma/puma/pull/936. - Fixes #23910.
* Merge pull request #24164 from prathamesh-sonpatki/fix-application-mailerRafael França2016-03-231-0/+13
|\ | | | | Correctly generate application_mailer.rb in mountable engines
| * Correctly generate application_mailer.rb in mountable enginesPrathamesh Sonpatki2016-03-121-0/+13
| | | | | | | | - Followup of https://github.com/rails/rails/pull/24161.
* | Merge pull request #24253 from y-yagi/change_default_value_of_cachingKasper Timm Hansen2016-03-211-1/+2
|\ \ | | | | | | changed default value of `caching` option to `nil`
| * | changed default value of `caching` option to `nil`yuuji.yaginuma2016-03-211-1/+2
| |/ | | | | | | | | | | | | The default is that's false, caching even if you do not specify the caching option is determined not to use, and `tmp/caching-dev.txt` will be deleted. If it is this, regardless of whether or not there is `tmp/caching-dev.txt`, be sure to order would be necessary to specify the caching option, I think that in than good to so as not to do anything by default.
* | Merge pull request #24243 from dewski/dont-upgrade-file-watcherArthur Neves2016-03-211-0/+14
|\ \ | | | | | | | | | Comment out config.file_watcher during Rails upgrade process
| * | Add tests for file_watcher config on updateArthur Neves2016-03-211-0/+14
| |/ | | | | | | [related #24243]
* | Fix generator test to match to use the stringRafael Mendonça França2016-03-211-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 12:36:58 +0000