aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #30773 from y-yagi/fix_30765Eileen M. Uchitelle2017-11-122-0/+34
|\ | | | | Make automatically synchronize test schema work inside engine
| * Make automatically synchronize test schema work inside engineyuuji.yaginuma2017-10-022-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails engine, migration files are in under `db/migrate` of engine. Therefore, when rake task is executed in engine, `db/migrate` is automatically added to `DatabaseTasks.migrations_paths`. https://github.com/rails/rails/blob/a18cf23a9cbcbeed61e8049442640c7153e0a8fb/activerecord/lib/active_record/railtie.rb#L39..L43 However, if execute the rake task under dummy app, migration files will not be loaded because engine's migration path setting process is not called. Therefore, in order to load migration files correctly, it is necessary to execute rake task under engine. Fixes #30765
* | Revert displaying master key generation info on `rails new`.Kasper Timm Hansen2017-11-123-23/+20
| | | | | | | | | | It's already a default for new apps, like so many others, so no need to flaunt it.
* | Deprecate encrypted secrets in favor of credentials.Kasper Timm Hansen2017-11-126-167/+50
| | | | | | | | | | | | | | | | Allow edits of existing encrypted secrets generated on Rails 5.1, but refer to credentials when attempting to setup. This also removes the need for any of the setup code, so the generator can be ripped out altogether.
* | Merge pull request #30770 from ↵Kasper Timm Hansen2017-11-123-2/+5
|\ \ | | | | | | | | | | | | y-yagi/do_not_create_credential_in_dummy_application Do not create credentials in dummy application
| * | Do not create credentials in dummy applicationyuuji.yaginuma2017-10-023-2/+5
| |/ | | | | | | | | Because dummy application is only for use test, so credentials is unnecessary.
* | Adjust blank linesRyuta Kamizono2017-11-104-4/+5
| |
* | Do not show credentials in generators helpyuuji.yaginuma2017-11-092-1/+3
| | | | | | | | | | | | Since credentials generator is executed via the credentials command and does not need to be executed directly, so it is not necessary to show it in help.
* | Merge pull request #31093 from bogdanvlviv/express-console-command-in-the-logRafael França2017-11-081-1/+1
|\ \ | | | | | | Change output log about skipping instalation of Active Storage
| * | Change output log about skipping instalation of Active Storagebogdanvlviv2017-11-081-1/+1
| | | | | | | | | | | | Using of "`" is preferable over "'" to express console command in output log
* | | Remove redundant passing --skip-active-storage in test casesbogdanvlviv2017-11-085-6/+6
|/ / | | | | | | These were added in #30101, after #31084 it became redundant.
* | Remove unnecessary migration deletionyuuji.yaginuma2017-11-085-19/+0
| | | | | | | | | | Since isolation application is generated with the `--skip-gemfile` option, so `active_storage:install` is not executed.
* | Do not run `active_storage:install` when bundle install is skippedyuuji.yaginuma2017-11-084-3/+24
| | | | | | | | | | | | | | In order to execute the `rails` command, need to run bundle install in advance. Therefore, if skipped bundle install, `rails` command may fail and should not do it.
* | Fix comment in `check_class_collision` [ci skip]yuuji.yaginuma2017-11-071-1/+1
| | | | | | | | `ScaffoldBase` was changed to `ResourceHelpers` by 0efedf2.
* | Fix `bin/rails db:migrate` with specified `VERSION`bogdanvlviv2017-11-061-2/+154
| | | | | | | | | | | | Ensure that `bin/rails db:migrate` with specified `VERSION` reverts all migrations only if `VERSION` is `0`. Raise error if target migration doesn't exist.
* | Merge pull request #30101 from bogdanvlviv/initialization-active_storageRafael França2017-11-0632-102/+384
|\ \ | | | | | | Provide initialization of Active Storage
| * | Execution of `active_storage:install` should respect `--quiet` during `rails ↵bogdanvlviv2017-11-061-1/+1
| | | | | | | | | | | | new`
| * | Rails::Generators::Actions#execute_command allows option `capture`bogdanvlviv2017-11-062-1/+23
| | |
| * | `rails new` runs `rails active_storage:install`bogdanvlviv2017-11-0614-36/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omit `rails activestorage:install` for jdbcmysql, jdbc and shebang tests AppGeneratorTest#test_config_jdbcmysql_database rails aborted! LoadError: Could not load 'active_record/connection_adapters/mysql_adapter'. Make sure that the adapter in config/database.yml is valid. If you use an adapter other than 'mysql2', 'postgresql' or 'sqlite3' add the necessary adapter gem to the Gemfile. (compressed) bin/rails:4:in `<main>' Tasks: TOP => activestorage:install => environment (See full trace by running task with --trace) AppGeneratorTest#test_config_jdbc_database rails aborted! LoadError: Could not load 'active_record/connection_adapters/jdbc_adapter'. Make sure that the adapter in config/database.yml is valid. If you use an adapter other than 'mysql2', 'postgresql' or 'sqlite3' add the necessary adapter gem to the Gemfile. (compressed) bin/rails:4:in `<main>' Tasks: TOP => activestorage:install => environment (See full trace by running task with --trace) AppGeneratorTest#test_shebang_is_added_to_rails_file /home/ubuntu/.rbenv/versions/2.4.1/bin/ruby: no Ruby script found in input (LoadError) Prevent PendingMigrationError in tests * Run `bin/rails db:migrate RAILS_ENV=test` in test_cases before start tests to prevent PendingMigrationError * FileUtils.rm_r("db/migrate") * --skip-active-storage Fix failed tests in `railties/test/railties/engine_test.rb` Related to #30111 Imporve `SharedGeneratorTests#test_default_frameworks_are_required_when_others_are_removed` - Explicitly skip active_storage - Ensure that skipped frameworks are commented - Ensure that default frameworks are not commented Fix error `Errno::ENOSPC: No space left on device - sendfile` Since `rails new` runs `rails active_storage:install` that boots an app. Since adding Bootsnap 0312a5c67e35b960e33677b5358c539f1047e4e1 during booting an app, it creates the cache: 264K tmp/cache/bootsnap-load-path-cache 27M tmp/cache/bootsnap-compile-cache * teardown_app must remove app
| * | Add --skip-active-storage and do so automatically when --skip-active-record ↵bogdanvlviv2017-11-0620-65/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is used Closes #30102 Revert part 787fe90dc0a7c5b91bb5af51f2858ea8c4676268 --skip-active-storage pass throughs `rails plugin new` Add changelog entry about default initialization of Active Storage
* | | Remove unused requireyuuji.yaginuma2017-11-061-1/+0
| | | | | | | | | | | | Since f182831, this file does not use methods added by `module/introspection`.
* | | Merge pull request #31053 from y-yagi/fix_namespaced_generatorEileen M. Uchitelle2017-11-053-10/+39
|\ \ \ | | | | | | | | Generate the correct path in nested scaffold generator
| * | | Generate the correct path in nested scaffold generatoryuuji.yaginuma2017-11-053-10/+39
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, namespaced scaffold generator will generate an incorrect path and the generated file will not work properly. ``` $ ./bin/rails g scaffold admin/user $ ./bin/rails db:migrate $ ./bin/rails t test/controllers # Running: E Error: Admin::UsersControllerTest#test_should_create_admin_user: NameError: undefined local variable or method `admin_admin_users_url' for #<Admin::UsersControllerTest:0x000055a59f25ff68> Did you mean? admin_users test/controllers/admin/users_controller_test.rb:20:in `block (2 levels) in <class:UsersControllerTest>' test/controllers/admin/users_controller_test.rb:19:in `block in <class:UsersControllerTest>' bin/rails test test/controllers/admin/users_controller_test.rb:18 ``` This is because combine `controller_class_path` and `singular_table_name` to generate route. https://github.com/rails/rails/blob/360698aa245b45349d1d1b12e1afb34759515e69/railties/lib/rails/generators/named_base.rb#L172 Normally, if using namspaced generator, table name already contains namespace. Therefore, adding `controller_class_path` adds extra namespace. Since it is special only when explicitly specifying `model-name`, it is modified to change the value only when `model-name`is specified. Follow up of #30729
* / / s/an/a/Akira Matsuda2017-11-041-1/+1
|/ /
* | Merge pull request #30813 from y-yagi/remove_unused_secrets_ymlRyuta Kamizono2017-10-262-36/+0
|\ \ | | | | | | Remove unused `secrets.yml` template
| * | Remove unused `secrets.yml` templateyuuji.yaginuma2017-10-062-36/+0
| | | | | | | | | | | | | | | `secrets.yml` no longer used since #30067. Together, removed `app_secret` method that only used in `secrets.yml`
* | | Merge pull request #30978 from y-yagi/change_vendor_path_to_app_rootGeorge Claghorn2017-10-241-2/+2
|\ \ \ | | | | | | | | Change `VENDOR_PATH` to `APP_ROOT` in `bin/yarn`
| * | | Change `VENDOR_PATH` to `APP_ROOT` in `bin/yarn`yuuji.yaginuma2017-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable was initially used to hold the vendor directory. https://github.com/rails/rails/commit/3dac36b Therefore, the variable name `VENDOR_PATH` was appropriate. However, `package.json` is now placed in the root of the project. https://github.com/rails/rails/commit/8e9e943 Therefore, like other bin scripts, I think the variable name `APP_ROOT` is appropriate. https://github.com/rails/rails/blob/2c845f6b03ddf2aa233b00385d24d769a4a34fa6/railties/lib/rails/generators/rails/app/templates/bin/setup.tt#L5 https://github.com/rails/rails/blob/2c845f6b03ddf2aa233b00385d24d769a4a34fa6/railties/lib/rails/generators/rails/app/templates/bin/update.tt#L5
* | | | add _ for unused last argRenan Gurgel2017-10-241-1/+1
| | | |
* | | | Space between { and | missing.Renan Gurgel2017-10-231-1/+1
|/ / / | | | | | | Improve a code style recommendation following Rubocop instructions https://codeclimate.com/github/rails/rails/issues
* | | Avoid slicing from Thor's original HWIAAkira Matsuda2017-10-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Because `options` here is not AS::HWIA but an instance of Thor::CoreExt::HWIA that looks very similar to ours but behaves slightly different, we need to keep this object be an instance of Thor::CoreExt::HWIA. Since Ruby 2.5 has Hash#slice that returns a new Hash instance now, we need to avoid calling `slice` on this tricky object.
* | | [Railties] require_relative => requireAkira Matsuda2017-10-2174-115/+115
| | | | | | | | | | | | This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32
* | | Merge pull request #30579 from ↵Sean Griffin2017-10-181-0/+47
|\ \ \ | | | | | | | | | | | | | | | | bogdanvlviv/fix_ar_internal_metadata_for_a_test_database Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ar_internal_metadata's data for a test database.
| * | | `ActiveRecord::Tasks::DatabaseTasks.load_schema` has always to establish ↵bogdanvlviv2017-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database connection When load schema from `structure.sql`, database connection isn't established. `ActiveRecord::Tasks::DatabaseTasks.load_schema` has to establish database connection since it executes ``` ActiveRecord::InternalMetadata.create_table ActiveRecord::InternalMetadata[:environment] = environment ```
| * | | Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ↵bogdanvlviv2017-10-151-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ar_internal_metadata's data for a test database. Before: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|development|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` After: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|test|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` Fixes #26731.
* | | | Improve out-of-box experience with System tests including ↵Guillermo Iguaran2017-10-182-0/+4
| | | | | | | | | | | | | | | | chromedriver-helper by default
* | | | Merge pull request #30911 from y-yagi/remove_unnecessary_allow_failure_trueRyuta Kamizono2017-10-181-1/+1
|\ \ \ \ | | | | | | | | | | Remove unnecessary `allow_failure: true` option
| * | | | Remove unnecessary `allow_failure: true` optionyuuji.yaginuma2017-10-181-1/+1
| |/ / / | | | | | | | | | | | | | | | | `routes` task always returns zero to status, so status is not to non-zeno. Ref: https://github.com/rails/rails/blob/b1867c480dd5476948ff0492ea2f91e2c2fcb04b/railties/lib/rails/tasks/routes.rake#L30
* / / / Fix typo in `allow_failure` argument [ci skip]yuuji.yaginuma2017-10-181-1/+1
|/ / / | | | | | | | | | Ref: https://github.com/rails/rails/blob/3be123ba26cad461a80d7d680819e71c1388a241/railties/test/isolation/abstract_unit.rb#L243
* | | Fix test name for daemon option testyuuji.yaginuma2017-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | In this test file, "server option" refers to the server used to start Rails(e.g. `puma`, `thin`). But this test, "server option" is not specified. Therefore, I think that it is incorrect that `server_option` is included in the test name.
* | | Added test case for starting rails with daemon option, this should set the ↵Pierre Hedkvist2017-10-131-0/+12
| | | | | | | | | | | | option[:daemonize] to true, otherwise the option[:daemonize] will be set to false
* | | Fix "warning: assigned but unused variable - message"yuuji.yaginuma2017-10-121-2/+1
| | | | | | | | | | | | Ruby 2.5 warns about this. Ref: https://travis-ci.org/rails/rails/jobs/286338999
* | | Merge pull request #30595 from bogdanvlviv/use-railties-rails-commandMatthew Draper2017-10-106-249/+207
|\ \ \ | | | | | | | | Improve railties' tests
| * | | Improve RakeTest#test_db_test_prepare_when_using_sql_formatbogdanvlviv2017-10-081-3/+1
| | | | | | | | | | | | | | | | | | | | - Remove redundant setting `RAILS_ENV` for `db:test:prepare`. `db:test:prepare` doesn't require it.
| * | | Invoke rails command inside the railties' test app with ↵bogdanvlviv2017-10-083-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | TestHelpers::Generation#rails See #30520
| * | | Remove redundant execution of `Dir.chdir(app_path) { }` in railties' testsbogdanvlviv2017-10-084-230/+194
| | | |
* | | | Merge pull request #30832 from y-yagi/simplify_console_testRyuta Kamizono2017-10-101-16/+3
|\ \ \ \ | | | | | | | | | | Simplify parse arguments in `ConsoleTest`
| * | | | Simplify parse arguments in `ConsoleTest`yuuji.yaginuma2017-10-081-16/+3
| |/ / / | | | | | | | | | | | | | | | | If need a parse result of arguments, can obtain it by creating an instance of the command.
* / / / redis-rb 4.0 supportJeremy Daer2017-10-082-1/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | * Use `gem 'redis', '~> 4.0'` for new app Gemfiles * Loosen Action Cable redis-rb dep to `>= 3.3, < 5` * Bump redis-namespace for looser Redis version dep * Avoid using the underlying `redis.client` directly * Use `Redis.new` instead of `Redis.connect`
* / / Remove needless setup from `InfoTest`yuuji.yaginuma2017-10-071-13/+0
|/ / | | | | | | | | | | The `abstract_unit` loads `rails/all`. Therefore, `Rails` is definitely defined. Also, since `Info` is autoloaded, do not need to explicitly load the file. https://github.com/rails/rails/blob/3ede539357acc91e377611cea9dd5f30678e7b2a/railties/lib/rails.rb#L29