diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-04-26 13:57:23 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-04-26 13:57:23 +0000 |
commit | c7df97710b5b519c8ea1b5bb92ae17579082d3f4 (patch) | |
tree | 70a748887b18194f48f09830a18b83dbb8a57b68 /spec | |
parent | 465a818061977b99c1756fe1c32b004ef035d3c0 (diff) | |
parent | 0e24b1280eca55bbe52931e530f3ce6ee38addc1 (diff) | |
download | gitlab-ce-c7df97710b5b519c8ea1b5bb92ae17579082d3f4.tar.gz |
Merge branch 'backport-md-cache-fix' into 'master'
Work around a hard-to-understand failure in `CacheMarkdownField`
See merge request !10918
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/concerns/cache_markdown_field_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/concerns/cache_markdown_field_spec.rb b/spec/models/concerns/cache_markdown_field_spec.rb index de0069bdcac..4edafbc4e32 100644 --- a/spec/models/concerns/cache_markdown_field_spec.rb +++ b/spec/models/concerns/cache_markdown_field_spec.rb @@ -18,7 +18,7 @@ describe CacheMarkdownField do end extend ActiveModel::Callbacks - define_model_callbacks :save + define_model_callbacks :create, :update include CacheMarkdownField cache_markdown_field :foo @@ -56,7 +56,7 @@ describe CacheMarkdownField do end def save - run_callbacks :save do + run_callbacks :update do changes_applied end end |