aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Keep all session tests in the same fileRafael Mendonça França2016-03-212-46/+28
| |
* | Fix request.reset_session for API controllersJon Moss2016-03-191-0/+46
|/ | | | | | | | | | | | Due to that `ActionDispatch::Flash` (the flash API's middleware) is not included for API controllers, the `request.reset_session` method, which relies on there being a `flash=` method which is in fact defined by the middleware, was previously breaking. Similarly to how add46482a540b33184f3011c5c307f4b8e90c9cc created a method to be overridden by the flash middleware in order to ensure non-breakage, this is how flashes are now reset. Fixes #24222
* generate application_mailer.rb if it is missingSen-Zhang2016-03-111-0/+6
|
* Merge pull request #23940 from prathamesh-sonpatki/rm-with-dispatchersRafael França2016-03-091-12/+12
|\ | | | | Remove passing `with_dispatchers` to AppGenerator
| * Remove passing `with_dispatchers` to AppGeneratorPrathamesh Sonpatki2016-03-091-12/+12
| | | | | | | | | | | | | | - While working on https://github.com/rails/rails/pull/22790 I found out that we pass `with_dispatchers: true` but it's not used at all by Rails. - We were passing `with_dispatchers: true` in few tests too but again it's not used by Rails.
* | AppGenerator: allow both 'rake' and 'rails'claudiob2016-03-091-5/+5
| | | | | | | | | | | | | | | | | | This commit comes from the comments made by @matthewd at https://github.com/rails/rails/pull/23795/files#r54469637 and by @rafaelfranca at https://github.com/rails/rails/pull/23795/files#r54609364 The idea is that if you type (for example) "rake db:migrate" in an AppGenerator, then this should actually invoke `rake db:migrate` on the command line, whereas if you type "rails_command db:migrate", this should invoke `rails db:migrate`.
* | Fix the tests after e594000Genadi Samokovarov2016-03-081-2/+2
| |
* | Drop the explicit version requirements for web-consoleGenadi Samokovarov2016-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Between major versions 2 and 3, we hit a bug. It's fixed in version 3, however, the explicit 2.x requirement of `~> '2.0'` will prevent people from getting the fix with `bundle update` and they would have to explicitly set the constraint to `~> '3.0'`. For more information see: rails/web-console#178. I propose we drop the explicit version constraints in the Gemfile. Web Console has been relatively stable for the past couple of years, and I don't anticipate any major alterations, like we saw between major versions 1 and 2.
* | Merge pull request #23939 from akshaymohite/fix-configuration-tests-semanticsSean Griffin2016-03-071-2/+2
|\ \ | | | | | | Fixed semantics of couple of tests in the configuration_test.rb [ci skip]
| * | Fixed couple of semantics in the configuration_test.rbAkshay2016-02-281-2/+2
| |/
* | Merge pull request #24085 from vipulnsward/i18n-test-additionKasper Timm Hansen2016-03-061-1/+7
|\ \ | | | | | | i18n fallbacks test fixes
| * | - Added i18n test to verify assigning hash directly to fallbacks instead of ↵Vipul A M2016-03-061-1/+7
| | | | | | | | | | | | | | | | | | using map - Fixed test name for setting fallbacks to config.i18n.fallbacks = [{ :ca => :'es-ES' }]
* | | Fix indentation [ci skip]Ryuta Kamizono2016-03-051-1/+1
| | | | | | | | | | | | Follow up to #24050.
* | | Merge pull request #24053 from mohitnatoo/rails-dev-cacheKasper Timm Hansen2016-03-041-1/+1
|\ \ \ | | | | | | | | using rails dev:cache instead of rake dev:cache in test case
| * | | - using rails dev:cache instead of rake dev:cache in test caseMohit Natoo2016-03-041-1/+1
| | | |
* | | | making a test definition more clear.Mohit Natoo2016-03-041-1/+1
| | | |
* | | | [ci skip] using correcting test case names specifying `rails routes` instead ↵Mohit Natoo2016-03-041-6/+6
|/ / / | | | | | | | | | of `rake routes`
* | | Add test to make sure the sprockets cache is not shared per environmentRafael Mendonça França2016-03-021-0/+20
| | |
* | | Merge pull request #24001 from 5t111111/fix-gsub-cookies_serializerRafael França2016-03-021-1/+2
|\ \ \ | | | | | | | | Fix description in cookies_serializer.rb being corrupted by gsub when updating
| * | | Fix description in cookies_serializer.rb being corrupted when updatingHirofumi Wakasugi2016-03-021-1/+2
| |/ /
* / / Fix typo in app_generator_test.rbHirofumi Wakasugi2016-03-021-1/+1
|/ /
* | Merge pull request #23932 from arthurnn/arthurnn/remove_load_pathsArthur Nogueira Neves2016-03-013-16/+2
|\ \ | | | | | | Remove load_paths file
| * | Remove load_paths fileArthur Neves2016-02-273-16/+2
| |/
* | Merge pull request #23935 from y-yagi/convert_cable_coffee_to_javascriptRafael França2016-03-012-2/+2
|\ \ | | | | | | convert cable.coffee to cable.js
| * | convert cable.coffee to cable.jsyuuji.yaginuma2016-02-282-2/+2
| |/ | | | | | | In order to eliminate the dependecy of CoffeeScript.
* | Merge pull request #23980 from rails/deprecate-controller-action-segmentsAndrew White2016-03-011-1/+1
|\ \ | | | | | | Deprecate :controller and :action path parameters
| * | Deprecate :controller and :action path parametersAndrew White2016-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Allowing :controller and :action values to be specified via the path in config/routes.rb has been an underlying cause of a number of issues in Rails that have resulted in security releases. In light of this it's better that controllers and actions are explicitly whitelisted rather than trying to blacklist or sanitize 'bad' values.
* | | Publish AS::Executor and AS::Reloader APIsMatthew Draper2016-03-022-28/+9
| | | | | | | | | | | | | | | | | | These should allow external code to run blocks of user code to do "work", at a similar unit size to a web request, without needing to get intimate with ActionDipatch.
* | | Mock fork twiceRafael Mendonça França2016-03-011-1/+1
| | |
* | | generate config/spring.rb in new applications [closes #18874]Xavier Noria2016-02-291-0/+2
|/ /
* | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-6/+6
| | | | | | | | Changed description with tests related to rails_command.
* | - Made changes to have test cases in actions_test more readable.Mohit Natoo2016-02-291-5/+5
| |
* | Address ruby warningsTeo Ljungberg2016-02-292-9/+9
|/ | | | | - Ambiguous first argument - Mismatched indentation
* Merge pull request #23921 from y-yagi/remove_rack_cors_initializer_when_updatingArthur Nogueira Neves2016-02-271-0/+26
|\ | | | | remove rack cors initializer when updating
| * remove rack cors initializer when updatingyuuji.yaginuma2016-02-271-0/+26
| | | | | | | | Rack cors initializer is only necessary to API-only applications, for when the update is unnecessary.
* | Merge pull request #23439 from ryohashimoto/160203_rake_railsKasper Timm Hansen2016-02-271-2/+2
|\ \ | |/ |/| Use app namespace for framework tasks
| * The tasks in the rails task namespace is deprecated in favor of app namespace.Ryo Hashimoto2016-02-261-2/+2
| | | | | | | | (e.g. `rails:update` and `rails:template` tasks is renamed to `app:update` and `app:template`.)