Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0d1ab349
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,发现更多精彩内容 >>
提交
0d1ab349
编写于
12月 30, 2014
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18266 from cristianbica/ajfixes
ActiveJob testing improvements
上级
04852b87
8a73f4b5
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
12 deletion
+21
-12
activejob/Rakefile
activejob/Rakefile
+1
-1
activejob/lib/active_job/queue_adapter.rb
activejob/lib/active_job/queue_adapter.rb
+3
-3
activejob/lib/active_job/queue_adapters/test_adapter.rb
activejob/lib/active_job/queue_adapters/test_adapter.rb
+11
-6
activejob/lib/active_job/test_helper.rb
activejob/lib/active_job/test_helper.rb
+2
-0
activejob/test/adapters/test.rb
activejob/test/adapters/test.rb
+3
-0
activejob/test/cases/adapter_test.rb
activejob/test/cases/adapter_test.rb
+1
-2
未找到文件。
activejob/Rakefile
浏览文件 @
0d1ab349
require
'rake/testtask'
require
'rubygems/package_task'
ACTIVEJOB_ADAPTERS
=
%w(inline delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner)
ACTIVEJOB_ADAPTERS
=
%w(inline delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner
test
)
ACTIVEJOB_ADAPTERS
-=
%w(queue_classic)
if
defined?
(
JRUBY_VERSION
)
task
default: :test
...
...
activejob/lib/active_job/queue_adapter.rb
浏览文件 @
0d1ab349
...
...
@@ -2,7 +2,7 @@
require
'active_support/core_ext/string/inflections'
module
ActiveJob
# The <tt>ActionJob::QueueAdapter</tt> module is used to load the
# The <tt>ActionJob::QueueAdapter</tt> module is used to load the
# correct adapter. The default queue adapter is the :inline queue.
module
QueueAdapter
#:nodoc:
extend
ActiveSupport
::
Concern
...
...
@@ -21,8 +21,8 @@ def queue_adapter=(name_or_adapter)
ActiveJob
::
QueueAdapters
::
TestAdapter
.
new
when
Symbol
,
String
load_adapter
(
name_or_adapter
)
when
Class
name_or_adapter
else
name_or_adapter
if
name_or_adapter
.
respond_to?
(
:enqueue
)
end
end
...
...
activejob/lib/active_job/queue_adapters/test_adapter.rb
浏览文件 @
0d1ab349
...
...
@@ -14,6 +14,11 @@ class TestAdapter
attr_accessor
(
:perform_enqueued_jobs
,
:perform_enqueued_at_jobs
)
attr_writer
(
:enqueued_jobs
,
:performed_jobs
)
def
initialize
self
.
perform_enqueued_jobs
=
false
self
.
perform_enqueued_at_jobs
=
false
end
# Provides a store of all the enqueued jobs with the TestAdapter so you can check them.
def
enqueued_jobs
@enqueued_jobs
||=
[]
...
...
@@ -26,19 +31,19 @@ def performed_jobs
def
enqueue
(
job
)
#:nodoc:
if
perform_enqueued_jobs
performed_jobs
<<
{
job:
job
.
class
,
args:
job
.
arguments
,
queue:
job
.
queue_name
}
job
.
perform_now
performed_jobs
<<
{
job:
job
.
class
,
args:
job
.
serialize
[
'arguments'
]
,
queue:
job
.
queue_name
}
Base
.
execute
job
.
serialize
else
enqueued_jobs
<<
{
job:
job
.
class
,
args:
job
.
arguments
,
queue:
job
.
queue_name
}
enqueued_jobs
<<
{
job:
job
.
class
,
args:
job
.
serialize
[
'arguments'
]
,
queue:
job
.
queue_name
}
end
end
def
enqueue_at
(
job
,
timestamp
)
#:nodoc:
if
perform_enqueued_at_jobs
performed_jobs
<<
{
job:
job
.
class
,
args:
job
.
arguments
,
queue:
job
.
queue_name
,
at:
timestamp
}
job
.
perform_now
performed_jobs
<<
{
job:
job
.
class
,
args:
job
.
serialize
[
'arguments'
]
,
queue:
job
.
queue_name
,
at:
timestamp
}
Base
.
execute
job
.
serialize
else
enqueued_jobs
<<
{
job:
job
.
class
,
args:
job
.
arguments
,
queue:
job
.
queue_name
,
at:
timestamp
}
enqueued_jobs
<<
{
job:
job
.
class
,
args:
job
.
serialize
[
'arguments'
]
,
queue:
job
.
queue_name
,
at:
timestamp
}
end
end
end
...
...
activejob/lib/active_job/test_helper.rb
浏览文件 @
0d1ab349
require
'active_support/core_ext/hash/keys'
module
ActiveJob
# Provides helper methods for testing Active Job
module
TestHelper
...
...
activejob/test/adapters/test.rb
0 → 100644
浏览文件 @
0d1ab349
ActiveJob
::
Base
.
queue_adapter
=
:test
ActiveJob
::
Base
.
queue_adapter
.
perform_enqueued_jobs
=
true
ActiveJob
::
Base
.
queue_adapter
.
perform_enqueued_at_jobs
=
true
activejob/test/cases/adapter_test.rb
浏览文件 @
0d1ab349
...
...
@@ -2,7 +2,6 @@
class
AdapterTest
<
ActiveSupport
::
TestCase
test
"should load
#{
ENV
[
'AJADAPTER'
]
}
adapter"
do
ActiveJob
::
Base
.
queue_adapter
=
ENV
[
'AJADAPTER'
].
to_sym
assert_equal
"active_job/queue_adapters/
#{
ENV
[
'AJADAPTER'
]
}
_adapter"
.
classify
.
constantize
,
ActiveJob
::
Base
.
queue_adapter
assert_equal
"active_job/queue_adapters/
#{
ENV
[
'AJADAPTER'
]
}
_adapter"
.
classify
,
ActiveJob
::
Base
.
queue_adapter
.
name
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录