Applied new rubocop version.
This commit is contained in:
parent
0a18954064
commit
4e94fd5790
3 changed files with 7 additions and 5 deletions
|
@ -1,7 +1,7 @@
|
|||
# Copyright (C) 2012-2014 Zammad Foundation, http://zammad-foundation.org/
|
||||
|
||||
class LongPollingController < ApplicationController
|
||||
skip_filter :session_update
|
||||
skip_action_callback :session_update # prevent race conditions
|
||||
|
||||
# GET /api/v1/message_send
|
||||
def message_send
|
||||
|
|
|
@ -218,9 +218,11 @@ translate strings in ruby context, e. g. for notifications
|
|||
def cache_clear
|
||||
Cache.delete( 'TranslationMap::' + locale.downcase )
|
||||
end
|
||||
|
||||
def self.cache_set(locale, data)
|
||||
Cache.write( 'TranslationMap::' + locale.downcase, data )
|
||||
end
|
||||
|
||||
def self.cache_get(locale)
|
||||
Cache.get( 'TranslationMap::' + locale.downcase )
|
||||
end
|
||||
|
|
|
@ -121,7 +121,7 @@ class ElasticsearchTest < ActiveSupport::TestCase
|
|||
Store.add(
|
||||
object: 'Ticket::Article',
|
||||
o_id: article1.id,
|
||||
data: File.open("#{Rails.root}/test/fixtures/es-normal.txt", 'rb') { |file| file.read },
|
||||
data: IO.read("#{Rails.root}/test/fixtures/es-normal.txt"),
|
||||
filename: 'es-normal.txt',
|
||||
preferences: {},
|
||||
created_by_id: 1,
|
||||
|
@ -132,7 +132,7 @@ class ElasticsearchTest < ActiveSupport::TestCase
|
|||
Store.add(
|
||||
object: 'Ticket::Article',
|
||||
o_id: article1.id,
|
||||
data: File.open("#{Rails.root}/test/fixtures/es-pdf1.pdf", 'rb') { |file| file.read },
|
||||
data: IO.read("#{Rails.root}/test/fixtures/es-pdf1.pdf"),
|
||||
filename: 'es-pdf1.pdf',
|
||||
preferences: {},
|
||||
created_by_id: 1,
|
||||
|
@ -143,7 +143,7 @@ class ElasticsearchTest < ActiveSupport::TestCase
|
|||
Store.add(
|
||||
object: 'Ticket::Article',
|
||||
o_id: article1.id,
|
||||
data: File.open("#{Rails.root}/test/fixtures/es-box1.box", 'rb') { |file| file.read },
|
||||
data: IO.read("#{Rails.root}/test/fixtures/es-box1.box"),
|
||||
filename: 'mail1.box',
|
||||
preferences: {},
|
||||
created_by_id: 1,
|
||||
|
@ -154,7 +154,7 @@ class ElasticsearchTest < ActiveSupport::TestCase
|
|||
Store.add(
|
||||
object: 'Ticket::Article',
|
||||
o_id: article1.id,
|
||||
data: File.open("#{Rails.root}/test/fixtures/es-too-big.txt", 'rb') { |file| file.read },
|
||||
data: IO.read("#{Rails.root}/test/fixtures/es-too-big.txt"),
|
||||
filename: 'es-too-big.txt',
|
||||
preferences: {},
|
||||
created_by_id: 1,
|
||||
|
|
Loading…
Reference in a new issue