aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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
| | | |