Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e20589c9
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
e20589c9
编写于
1月 16, 2019
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove deprecated `environment` argument from the rails commands
上级
9d39f81d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
55 deletion
+10
-55
railties/CHANGELOG.md
railties/CHANGELOG.md
+4
-0
railties/lib/rails/command/environment_argument.rb
railties/lib/rails/command/environment_argument.rb
+1
-11
railties/test/application/console_test.rb
railties/test/application/console_test.rb
+1
-1
railties/test/commands/console_test.rb
railties/test/commands/console_test.rb
+2
-25
railties/test/commands/dbconsole_test.rb
railties/test/commands/dbconsole_test.rb
+2
-18
未找到文件。
railties/CHANGELOG.md
浏览文件 @
e20589c9
*
Remove deprecated
`environment`
argument from the rails commands.
*Rafael Mendonça França*
*
Remove deprecated
`capify!`
.
*Rafael Mendonça França*
...
...
railties/lib/rails/command/environment_argument.rb
浏览文件 @
e20589c9
...
...
@@ -8,23 +8,13 @@ module EnvironmentArgument #:nodoc:
extend
ActiveSupport
::
Concern
included
do
argument
:environment
,
optional:
true
,
banner:
"environment"
class_option
:environment
,
aliases:
"-e"
,
type: :string
,
desc:
"Specifies the environment to run this console under (test/development/production)."
end
private
def
extract_environment_option_from_argument
if
environment
self
.
options
=
options
.
merge
(
environment:
acceptable_environment
(
environment
))
ActiveSupport
::
Deprecation
.
warn
"Passing the environment's name as a "
\
"regular argument is deprecated and "
\
"will be removed in the next Rails "
\
"version. Please, use the -e option "
\
"instead."
elsif
options
[
:environment
]
if
options
[
:environment
]
self
.
options
=
options
.
merge
(
environment:
acceptable_environment
(
options
[
:environment
]))
else
self
.
options
=
options
.
merge
(
environment:
Rails
::
Command
.
environment
)
...
...
railties/test/application/console_test.rb
浏览文件 @
e20589c9
...
...
@@ -149,7 +149,7 @@ def test_sandbox
end
def
test_environment_option_and_irb_option
spawn_console
(
"test -- --verbose"
)
spawn_console
(
"
-e
test -- --verbose"
)
write_prompt
"a = 1"
,
"a = 1"
write_prompt
"puts Rails.env"
,
"puts Rails.env
\r\n
test"
...
...
railties/test/commands/console_test.rb
浏览文件 @
e20589c9
...
...
@@ -94,28 +94,7 @@ def test_environment_option
assert_match
(
/\sspecial-production\s/
,
output
)
end
def
test_rails_env_is_production_when_first_argument_is_p
assert_deprecated
do
start
[
"p"
]
assert_match
(
/\sproduction\s/
,
output
)
end
end
def
test_rails_env_is_test_when_first_argument_is_t
assert_deprecated
do
start
[
"t"
]
assert_match
(
/\stest\s/
,
output
)
end
end
def
test_rails_env_is_development_when_argument_is_d
assert_deprecated
do
start
[
"d"
]
assert_match
(
/\sdevelopment\s/
,
output
)
end
end
def
test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
def
test_rails_env_is_dev_when_environment_option_is_dev_and_dev_env_is_present
Rails
::
Command
::
ConsoleCommand
.
class_eval
do
alias_method
:old_environments
,
:available_environments
...
...
@@ -124,9 +103,7 @@ def test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
end
end
assert_deprecated
do
assert_match
(
"dev"
,
parse_arguments
([
"dev"
])[
:environment
])
end
assert_match
(
"dev"
,
parse_arguments
([
"-e"
,
"dev"
])[
:environment
])
ensure
Rails
::
Command
::
ConsoleCommand
.
class_eval
do
undef_method
:available_environments
...
...
railties/test/commands/dbconsole_test.rb
浏览文件 @
e20589c9
...
...
@@ -99,28 +99,12 @@ def test_env
ENV
[
"RACK_ENV"
]
=
nil
end
def
test_rails_env_is_development_when_argument_is_dev
assert_deprecated
do
stub_available_environments
([
"development"
,
"test"
])
do
assert_match
(
"development"
,
parse_arguments
([
"dev"
])[
:environment
])
end
end
end
def
test_rails_env_is_development_when_environment_option_is_dev
stub_available_environments
([
"development"
,
"test"
])
do
assert_match
(
"development"
,
parse_arguments
([
"-e"
,
"dev"
])[
:environment
])
end
end
def
test_rails_env_is_dev_when_argument_is_dev_and_dev_env_is_present
assert_deprecated
do
stub_available_environments
([
"dev"
])
do
assert_match
(
"dev"
,
parse_arguments
([
"dev"
])[
:environment
])
end
end
end
def
test_mysql
start
(
adapter:
"mysql2"
,
database:
"db"
)
assert_not
aborted
...
...
@@ -265,14 +249,14 @@ def test_print_help_short
stdout
=
capture
(
:stdout
)
do
Rails
::
Command
.
invoke
(
:dbconsole
,
[
"-h"
])
end
assert_match
(
/rails dbconsole \[
environment
\]/
,
stdout
)
assert_match
(
/rails dbconsole \[
options
\]/
,
stdout
)
end
def
test_print_help_long
stdout
=
capture
(
:stdout
)
do
Rails
::
Command
.
invoke
(
:dbconsole
,
[
"--help"
])
end
assert_match
(
/rails dbconsole \[
environment
\]/
,
stdout
)
assert_match
(
/rails dbconsole \[
options
\]/
,
stdout
)
end
attr_reader
:aborted
,
:output
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录