From 54fd62487c4c352328eda7cc824053e4c784f852 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Fri, 3 Jul 2015 17:18:01 +0200 Subject: [PATCH] Applied rubocop cop 'Style/SpaceInsideStringInterpolation'. --- app/controllers/long_polling_controller.rb | 4 ++-- app/controllers/rss_controller.rb | 2 +- .../ticket_overviews_controller.rb | 2 +- app/models/application_model.rb | 8 ++++---- app/models/avatar.rb | 2 +- app/models/channel/filter/database.rb | 6 +++--- app/models/scheduler.rb | 6 +++--- app/models/store.rb | 4 ++-- app/models/store/file.rb | 10 +++++----- app/models/store/provider/file.rb | 12 +++++------ app/models/ticket/overviews.rb | 2 +- app/models/user/search_index.rb | 2 +- lib/core_ext/string.rb | 2 +- lib/sessions.rb | 8 ++++---- lib/sessions/backend/activity_stream.rb | 4 ++-- lib/sessions/backend/collections/base.rb | 6 +++--- lib/sessions/backend/rss.rb | 4 ++-- lib/sessions/backend/ticket_create.rb | 4 ++-- lib/sessions/backend/ticket_overview_index.rb | 4 ++-- lib/sessions/backend/ticket_overview_list.rb | 4 ++-- lib/sessions/client.rb | 2 +- script/websocket-server.rb | 20 +++++++++---------- test/browser/agent_user_manage_test.rb | 2 +- test/browser_test_helper.rb | 2 +- test/unit/activity_stream_test.rb | 2 +- test/unit/online_notifiaction_test.rb | 2 +- test/unit/store_test.rb | 6 +++--- test/unit/tag_test.rb | 4 ++-- test/unit/user_test.rb | 12 +++++------ 29 files changed, 74 insertions(+), 74 deletions(-) diff --git a/app/controllers/long_polling_controller.rb b/app/controllers/long_polling_controller.rb index 8f292cbbb..223f96438 100644 --- a/app/controllers/long_polling_controller.rb +++ b/app/controllers/long_polling_controller.rb @@ -38,7 +38,7 @@ class LongPollingController < ApplicationController spool = Sessions.spool_list( params['data']['timestamp'], current_user.id ) spool.each { |item| if item[:type] == 'direct' - log "send spool to (user_id=#{ current_user.id })", client_id + log "send spool to (user_id=#{current_user.id})", client_id Sessions.send( client_id, item[:message] ) else log 'send spool', client_id @@ -159,6 +159,6 @@ class LongPollingController < ApplicationController end def log( data, client_id = '-' ) - logger.info "client(#{ client_id }) #{ data }" + logger.info "client(#{client_id}) #{data}" end end diff --git a/app/controllers/rss_controller.rb b/app/controllers/rss_controller.rb index 3a38bbf5f..8cd82f995 100644 --- a/app/controllers/rss_controller.rb +++ b/app/controllers/rss_controller.rb @@ -21,7 +21,7 @@ curl http://localhost/api/v1/rss_fetch.json -v -u #{login}:#{password} -H "Conte def fetch items = Rss.fetch(params[:url], params[:limit]) if items.nil? - render json: { message: "failed to fetch #{ params[:url] }", status: :unprocessable_entity } + render json: { message: "failed to fetch #{params[:url]}", status: :unprocessable_entity } return end render json: { items: items } diff --git a/app/controllers/ticket_overviews_controller.rb b/app/controllers/ticket_overviews_controller.rb index f74a634ba..c21144050 100644 --- a/app/controllers/ticket_overviews_controller.rb +++ b/app/controllers/ticket_overviews_controller.rb @@ -44,7 +44,7 @@ class TicketOverviewsController < ApplicationController array: true, ) if !overview - render json: { error: "No such view #{ params[:view] }!" }, status: :unprocessable_entity + render json: { error: "No such view #{params[:view]}!" }, status: :unprocessable_entity return end diff --git a/app/models/application_model.rb b/app/models/application_model.rb index 1ccc18a31..c3290bf28 100644 --- a/app/models/application_model.rb +++ b/app/models/application_model.rb @@ -524,7 +524,7 @@ class OwnModel < ApplicationModel # return if we run import mode return if Setting.get('import_mode') - logger.debug "#{ self.class.name }.find(#{ id }) notify created " + created_at.to_s + logger.debug "#{self.class.name}.find(#{id}) notify created " + created_at.to_s class_name = self.class.name class_name.gsub!(/::/, '') Sessions.broadcast( @@ -553,7 +553,7 @@ class OwnModel < ApplicationModel # return if we run import mode return if Setting.get('import_mode') - logger.debug "#{ self.class.name }.find(#{ id }) notify UPDATED " + updated_at.to_s + logger.debug "#{self.class.name}.find(#{id}) notify UPDATED " + updated_at.to_s class_name = self.class.name class_name.gsub!(/::/, '') Sessions.broadcast( @@ -582,7 +582,7 @@ class OwnModel < ApplicationModel # return if we run import mode return if Setting.get('import_mode') - logger.debug "#{ self.class.name }.find(#{ id }) notify TOUCH " + updated_at.to_s + logger.debug "#{self.class.name}.find(#{id}) notify TOUCH " + updated_at.to_s class_name = self.class.name class_name.gsub!(/::/, '') Sessions.broadcast( @@ -610,7 +610,7 @@ class OwnModel < ApplicationModel # return if we run import mode return if Setting.get('import_mode') - logger.debug "#{ self.class.name }.find(#{ id }) notify DESTOY " + updated_at.to_s + logger.debug "#{self.class.name}.find(#{id}) notify DESTOY " + updated_at.to_s class_name = self.class.name class_name.gsub!(/::/, '') Sessions.broadcast( diff --git a/app/models/avatar.rb b/app/models/avatar.rb index a95cb0609..54bb963c0 100644 --- a/app/models/avatar.rb +++ b/app/models/avatar.rb @@ -288,7 +288,7 @@ return all avatars of an user data = avatar.attributes if avatar.store_resize_id file = Store.find(avatar.store_resize_id) - data['content'] = "data:#{ file.preferences['Mime-Type'] };base64,#{ Base64.strict_encode64( file.content ) }" + data['content'] = "data:#{file.preferences['Mime-Type']};base64,#{Base64.strict_encode64( file.content )}" end avatar_list.push data end diff --git a/app/models/channel/filter/database.rb b/app/models/channel/filter/database.rb index 1c1ad6a34..adc3d5c6d 100644 --- a/app/models/channel/filter/database.rb +++ b/app/models/channel/filter/database.rb @@ -19,10 +19,10 @@ module Channel::Filter::Database scan = mail[ key.downcase.to_sym ].scan(/#{value}/i) end if match && scan[0] - Rails.logger.info " matching #{ key.downcase }:'#{ mail[ key.downcase.to_sym ] }' on #{value}" + Rails.logger.info " matching #{key.downcase}:'#{mail[ key.downcase.to_sym ]}' on #{value}" match = true else - Rails.logger.info " is not matching #{ key.downcase }:'#{ mail[ key.downcase.to_sym ] }' on #{value}" + Rails.logger.info " is not matching #{key.downcase}:'#{mail[ key.downcase.to_sym ]}' on #{value}" match = false end rescue => e @@ -36,7 +36,7 @@ module Channel::Filter::Database next if !match filter[:perform].each {|key, value| - Rails.logger.info " perform '#{ key.downcase }' = '#{value}'" + Rails.logger.info " perform '#{key.downcase}' = '#{value}'" mail[ key.downcase.to_sym ] = value } } diff --git a/app/models/scheduler.rb b/app/models/scheduler.rb index 2eee1b719..11ecdbe9b 100644 --- a/app/models/scheduler.rb +++ b/app/models/scheduler.rb @@ -22,7 +22,7 @@ class Scheduler < ApplicationModel begin ActiveRecord::Base.connection.reconnect! rescue => e - logger.error "Can't reconnect to database #{ e.inspect }" + logger.error "Can't reconnect to database #{e.inspect}" end # read/load jobs and check if it is alredy started @@ -89,13 +89,13 @@ class Scheduler < ApplicationModel logger.info "execute #{job.method} (try_count #{try_count})..." eval job.method() # rubocop:disable Lint/Eval rescue => e - logger.error "execute #{job.method} (try_count #{try_count}) exited with error #{ e.inspect }" + logger.error "execute #{job.method} (try_count #{try_count}) exited with error #{e.inspect}" # reconnect in case db connection is lost begin ActiveRecord::Base.connection.reconnect! rescue => e - logger.error "Can't reconnect to database #{ e.inspect }" + logger.error "Can't reconnect to database #{e.inspect}" end try_run_max = 10 diff --git a/app/models/store.rb b/app/models/store.rb index 833acf063..e2cc3afcd 100644 --- a/app/models/store.rb +++ b/app/models/store.rb @@ -142,7 +142,7 @@ returns def content file = Store::File.find_by( id: store_file_id ) if !file - fail "No such file #{ store_file_id }!" + fail "No such file #{store_file_id}!" end file.content end @@ -150,7 +150,7 @@ returns def provider file = Store::File.find_by( id: store_file_id ) if !file - fail "No such file #{ store_file_id }!" + fail "No such file #{store_file_id}!" end file.provider end diff --git a/app/models/store/file.rb b/app/models/store/file.rb index cdbfbbfc1..44ddd024c 100644 --- a/app/models/store/file.rb +++ b/app/models/store/file.rb @@ -17,7 +17,7 @@ class Store if !adapter_name fail 'Missing storage_provider setting option' end - adapter = load_adapter( "Store::Provider::#{ adapter_name }" ) + adapter = load_adapter( "Store::Provider::#{adapter_name}" ) adapter.add( data, sha ) file = Store::File.create( provider: adapter_name, @@ -29,7 +29,7 @@ class Store # read content def content - adapter = self.class.load_adapter("Store::Provider::#{ provider }") + adapter = self.class.load_adapter("Store::Provider::#{provider}") if sha c = adapter.get( sha ) else @@ -62,8 +62,8 @@ class Store # e. g. Store::File.move('File', 'DB') # e. g. Store::File.move('DB', 'File') def self.move(source, target) - adapter_source = load_adapter("Store::Provider::#{ source }") - adapter_target = load_adapter("Store::Provider::#{ target }") + adapter_source = load_adapter("Store::Provider::#{source}") + adapter_target = load_adapter("Store::Provider::#{target}") Store::File.all.each {|item| next if item.provider == target @@ -86,7 +86,7 @@ class Store private def destroy_provider - adapter = self.class.load_adapter("Store::Provider::#{ provider }") + adapter = self.class.load_adapter("Store::Provider::#{provider}") adapter.delete( sha ) end end diff --git a/app/models/store/provider/file.rb b/app/models/store/provider/file.rb index 2629a762e..69ed9c9af 100644 --- a/app/models/store/provider/file.rb +++ b/app/models/store/provider/file.rb @@ -9,7 +9,7 @@ class Store::Provider::File # install file permission = '600' if !File.exist?( get_locaton(sha) ) - Rails.logger.debug "storge write '#{ get_locaton(sha) }' (#{permission})" + Rails.logger.debug "storge write '#{get_locaton(sha)}' (#{permission})" file = File.new( get_locaton(sha), 'wb' ) file.write( data ) file.close @@ -19,7 +19,7 @@ class Store::Provider::File # check sha local_sha = Digest::SHA256.hexdigest( get(sha) ) if sha != local_sha - fail "ERROR: Corrupt file in fs #{ get_locaton(sha) }, sha should be #{sha} but is #{local_sha}" + fail "ERROR: Corrupt file in fs #{get_locaton(sha)}, sha should be #{sha} but is #{local_sha}" end true @@ -27,9 +27,9 @@ class Store::Provider::File # read file from fs def self.get(sha) - Rails.logger.debug "read from fs #{ get_locaton(sha) }" + Rails.logger.debug "read from fs #{get_locaton(sha)}" if !File.exist?( get_locaton(sha) ) - fail "ERROR: No such file #{ get_locaton(sha) }" + fail "ERROR: No such file #{get_locaton(sha)}" end data = File.open( get_locaton(sha), 'rb' ) content = data.read @@ -37,7 +37,7 @@ class Store::Provider::File # check sha local_sha = Digest::SHA256.hexdigest( content ) if local_sha != sha - fail "ERROR: Corrupt file in fs #{ get_locaton(sha) }, sha should be #{sha} but is #{local_sha}" + fail "ERROR: Corrupt file in fs #{get_locaton(sha)}, sha should be #{sha} but is #{local_sha}" end content end @@ -45,7 +45,7 @@ class Store::Provider::File # unlink file from fs def self.delete(sha) if File.exist?( get_locaton(sha) ) - Rails.logger.info "storge remove '#{ get_locaton(sha) }'" + Rails.logger.info "storge remove '#{get_locaton(sha)}'" File.delete( get_locaton(sha) ) end end diff --git a/app/models/ticket/overviews.rb b/app/models/ticket/overviews.rb index ffd5e1f98..0e019258a 100644 --- a/app/models/ticket/overviews.rb +++ b/app/models/ticket/overviews.rb @@ -88,7 +88,7 @@ returns } if data[:view] && !overview_selected - fail "No such view '#{ data[:view] }'" + fail "No such view '#{data[:view]}'" end # sortby diff --git a/app/models/user/search_index.rb b/app/models/user/search_index.rb index 5a4757af4..870261db0 100644 --- a/app/models/user/search_index.rb +++ b/app/models/user/search_index.rb @@ -17,7 +17,7 @@ returns =end def search_index_data - attributes = { 'fullname' => "#{ self['firstname'] } #{ self['lastname'] }" } + attributes = { 'fullname' => "#{self['firstname']} #{self['lastname']}" } %w(login firstname lastname phone email address city country note created_at).each { |key| if self[key] && (!self.respond_to?('empty?') || !self[key].empty?) attributes[key] = self[key] diff --git a/lib/core_ext/string.rb b/lib/core_ext/string.rb index 24c70d2c7..628abffab 100644 --- a/lib/core_ext/string.rb +++ b/lib/core_ext/string.rb @@ -57,7 +57,7 @@ class String return if ActiveRecord::Base.connection_config[:adapter] != 'mysql2' each_char.select {|c| if c.bytes.count > 3 - Rails.logger.warn "strip out 4 bytes utf8 chars '#{c}' of '#{ self }'" + Rails.logger.warn "strip out 4 bytes utf8 chars '#{c}' of '#{self}'" next end c diff --git a/lib/sessions.rb b/lib/sessions.rb index 7bb8032f3..b0d38a3af 100644 --- a/lib/sessions.rb +++ b/lib/sessions.rb @@ -295,7 +295,7 @@ returns def self.send( client_id, data ) path = "#{@path}/#{client_id}/" - filename = "send-#{ Time.now.utc.to_f }" + filename = "send-#{Time.now.utc.to_f}" check = true count = 0 while check @@ -458,7 +458,7 @@ returns begin message_parsed = JSON.parse( spool['msg'] ) rescue => e - log('error', "can't parse spool message: #{ message }, #{ e.inspect }") + log('error', "can't parse spool message: #{message}, #{e.inspect}") next end @@ -579,13 +579,13 @@ returns begin Sessions::Client.new(client_id) rescue => e - log('error', "thread_client #{client_id} exited with error #{ e.inspect }") + log('error', "thread_client #{client_id} exited with error #{e.inspect}") log('error', e.backtrace.join("\n ") ) sleep 10 begin ActiveRecord::Base.connection_pool.release_connection rescue => e - log('error', "Can't reconnect to database #{ e.inspect }") + log('error', "Can't reconnect to database #{e.inspect}") end try_run_max = 10 diff --git a/lib/sessions/backend/activity_stream.rb b/lib/sessions/backend/activity_stream.rb index 3d5697418..d3ee37ec4 100644 --- a/lib/sessions/backend/activity_stream.rb +++ b/lib/sessions/backend/activity_stream.rb @@ -29,7 +29,7 @@ class Sessions::Backend::ActivityStream end def client_key - "as::load::#{ self.class }::#{ @user.id }::#{ @client_id }" + "as::load::#{self.class}::#{@user.id}::#{@client_id}" end def push @@ -53,7 +53,7 @@ class Sessions::Backend::ActivityStream } end - @client.log "push activity_stream #{ data.first.class } for user #{ @user.id }" + @client.log "push activity_stream #{data.first.class} for user #{@user.id}" @client.send( event: 'activity_stream_rebuild', collection: 'activity_stream', diff --git a/lib/sessions/backend/collections/base.rb b/lib/sessions/backend/collections/base.rb index 012054574..187ff0269 100644 --- a/lib/sessions/backend/collections/base.rb +++ b/lib/sessions/backend/collections/base.rb @@ -16,7 +16,7 @@ class Sessions::Backend::Collections::Base end def client_key - "collections::load::#{ self.class }::#{ @user.id }::#{ @client_id }" + "collections::load::#{self.class}::#{@user.id}::#{@client_id}" end def push @@ -77,13 +77,13 @@ class Sessions::Backend::Collections::Base assets: assets, } end - @client.log "push assets for push_collection #{ items.first.class } for user #{ @user.id }" + @client.log "push assets for push_collection #{items.first.class} for user #{@user.id}" @client.send( data: assets, event: [ 'loadAssets' ], ) - @client.log "push push_collection #{ items.first.class } for user #{ @user.id }" + @client.log "push push_collection #{items.first.class} for user #{@user.id}" @client.send( event: 'resetCollection', data: { diff --git a/lib/sessions/backend/rss.rb b/lib/sessions/backend/rss.rb index e1ac50dac..f6f3e9835 100644 --- a/lib/sessions/backend/rss.rb +++ b/lib/sessions/backend/rss.rb @@ -10,7 +10,7 @@ class Sessions::Backend::Rss end def collection_key - "rss::load::#{ self.class }::#{ @user.id }" + "rss::load::#{self.class}::#{@user.id}" end def load @@ -29,7 +29,7 @@ class Sessions::Backend::Rss end def client_key - "rss::load::#{ self.class }::#{ @user.id }::#{ @client_id }" + "rss::load::#{self.class}::#{@user.id}::#{@client_id}" end def push diff --git a/lib/sessions/backend/ticket_create.rb b/lib/sessions/backend/ticket_create.rb index ed62673a3..cc3fcd501 100644 --- a/lib/sessions/backend/ticket_create.rb +++ b/lib/sessions/backend/ticket_create.rb @@ -27,7 +27,7 @@ class Sessions::Backend::TicketCreate end def client_key - "as::load::#{ self.class }::#{ @user.id }::#{ @client_id }" + "as::load::#{self.class}::#{@user.id}::#{@client_id}" end def push @@ -58,7 +58,7 @@ class Sessions::Backend::TicketCreate } end - @client.log "push ticket_create for user #{ @user.id }" + @client.log "push ticket_create for user #{@user.id}" @client.send( collection: 'ticket_create_attributes', data: data, diff --git a/lib/sessions/backend/ticket_overview_index.rb b/lib/sessions/backend/ticket_overview_index.rb index 2936e240f..5055a38ec 100644 --- a/lib/sessions/backend/ticket_overview_index.rb +++ b/lib/sessions/backend/ticket_overview_index.rb @@ -28,7 +28,7 @@ class Sessions::Backend::TicketOverviewIndex end def client_key - "as::load::#{ self.class }::#{ @user.id }::#{ @client_id }" + "as::load::#{self.class}::#{@user.id}::#{@client_id}" end def push @@ -56,7 +56,7 @@ class Sessions::Backend::TicketOverviewIndex } end - @client.log "push overview_index for user #{ @user.id }" + @client.log "push overview_index for user #{@user.id}" @client.send( event: ['ticket_overview_index'], data: data, diff --git a/lib/sessions/backend/ticket_overview_list.rb b/lib/sessions/backend/ticket_overview_list.rb index ab4c861a0..60ead97fe 100644 --- a/lib/sessions/backend/ticket_overview_list.rb +++ b/lib/sessions/backend/ticket_overview_list.rb @@ -38,7 +38,7 @@ class Sessions::Backend::TicketOverviewList end def client_key - "as::load::#{ self.class }::#{ @user.id }::#{ @client_id }" + "as::load::#{self.class}::#{@user.id}::#{@client_id}" end def push @@ -102,7 +102,7 @@ class Sessions::Backend::TicketOverviewList results.push result else - @client.log "push overview_list for user #{ @user.id }" + @client.log "push overview_list for user #{@user.id}" # send update to browser @client.send( diff --git a/lib/sessions/client.rb b/lib/sessions/client.rb index 1c16890af..f5270f109 100644 --- a/lib/sessions/client.rb +++ b/lib/sessions/client.rb @@ -71,6 +71,6 @@ class Sessions::Client end def log( msg ) - Rails.logger.debug "client(#{ @client_id }) #{ msg }" + Rails.logger.debug "client(#{@client_id}) #{msg}" end end diff --git a/script/websocket-server.rb b/script/websocket-server.rb index 272f71e72..578b4fdcf 100755 --- a/script/websocket-server.rb +++ b/script/websocket-server.rb @@ -59,7 +59,7 @@ if ARGV[0] != 'start' && ARGV[0] != 'stop' exit end -puts "Starting websocket server on #{ @options[:b] }:#{ @options[:p] } (secure:#{ @options[:s] },pid:#{@options[:i]})" +puts "Starting websocket server on #{@options[:b]}:#{@options[:p]} (secure:#{@options[:s]},pid:#{@options[:i]})" #puts options.inspect if ARGV[0] == 'stop' @@ -119,11 +119,11 @@ EventMachine.run { ws.onmessage { |msg| client_id = ws.object_id.to_s - log 'debug', "received: #{ msg } ", client_id + log 'debug', "received: #{msg} ", client_id begin data = JSON.parse(msg) rescue => e - log 'error', "can't parse message: #{ msg }, #{ e.inspect }", client_id + log 'error', "can't parse message: #{msg}, #{e.inspect}", client_id next end @@ -151,7 +151,7 @@ EventMachine.run { # create new msg to push to client if item[:type] == 'direct' - log 'notice', "send spool to (user_id=#{ @clients[client_id][:session]['id'] })", client_id + log 'notice', "send spool to (user_id=#{@clients[client_id][:session]['id']})", client_id websocket_send(client_id, item[:message]) else log 'notice', 'send spool', client_id @@ -198,13 +198,13 @@ EventMachine.run { # broadcast to recipient list if data['recipient'] if data['recipient'].class != Hash - log 'error', "recipient attribute isn't a hash '#{ data['recipient'].inspect }'" + log 'error', "recipient attribute isn't a hash '#{data['recipient'].inspect}'" else if !data['recipient'].key?('user_id') - log 'error', "need recipient.user_id attribute '#{ data['recipient'].inspect }'" + log 'error', "need recipient.user_id attribute '#{data['recipient'].inspect}'" else if data['recipient']['user_id'].class != Array - log 'error', "recipient.user_id attribute isn't an array '#{ data['recipient']['user_id'].inspect }'" + log 'error', "recipient.user_id attribute isn't an array '#{data['recipient']['user_id'].inspect}'" else data['recipient']['user_id'].each { |user_id| @@ -251,7 +251,7 @@ EventMachine.run { EventMachine.add_periodic_timer(20) { # websocket - log 'notice', "Status: websocket clients: #{ @clients.size }" + log 'notice', "Status: websocket clients: #{@clients.size}" @clients.each { |client_id, _client| log 'notice', 'working...', client_id } @@ -263,7 +263,7 @@ EventMachine.run { next if client[:meta][:type] == 'websocket' clients = clients + 1 } - log 'notice', "Status: ajax clients: #{ clients }" + log 'notice', "Status: ajax clients: #{clients}" client_list.each {|client_id, client| next if client[:meta][:type] == 'websocket' log 'notice', 'working...', client_id @@ -346,7 +346,7 @@ EventMachine.run { if !@options[:v] return if level == 'debug' end - puts "#{Time.now.utc.iso8601}:client(#{ client_id }) #{ data }" + puts "#{Time.now.utc.iso8601}:client(#{client_id}) #{data}" #puts "#{Time.now.utc.iso8601}:#{ level }:client(#{ client_id }) #{ data }" end diff --git a/test/browser/agent_user_manage_test.rb b/test/browser/agent_user_manage_test.rb index 3ab4a6aba..d3b0311ba 100644 --- a/test/browser/agent_user_manage_test.rb +++ b/test/browser/agent_user_manage_test.rb @@ -6,7 +6,7 @@ class AgentUserManageTest < TestCase customer_user_email = 'customer-test-' + rand(999_999).to_s + '@example.com' firstname = 'Customer Firstname' lastname = 'Customer Lastname' - fullname = "#{ firstname } #{ lastname } <#{ customer_user_email }>" + fullname = "#{firstname} #{lastname} <#{customer_user_email}>" @browser = browser_instance login( diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index 52aff170e..44efd83b0 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -1095,7 +1095,7 @@ wait untill text in selector disabppears sleep 1 } screenshot( browser: instance, comment: 'ticket_create_failed' ) - fail "ticket creation failed, can't get zoom url (current url is '#{ instance.current_url }')" + fail "ticket creation failed, can't get zoom url (current url is '#{instance.current_url}')" end =begin diff --git a/test/unit/activity_stream_test.rb b/test/unit/activity_stream_test.rb index 2845209d8..d791a3d95 100644 --- a/test/unit/activity_stream_test.rb +++ b/test/unit/activity_stream_test.rb @@ -385,7 +385,7 @@ class ActivityStreamTest < ActiveSupport::TestCase assert_equal( check_item[:o_id], item['o_id'] ) else if check_item[:object] == item['object'] && check_item[:type] == item['type'] && check_item[:o_id] == item['o_id'] - assert( false, "entry should not exist #{ item['object'] }/#{ item['type'] }/#{ item['o_id'] }" ) + assert( false, "entry should not exist #{item['object']}/#{item['type']}/#{item['o_id']}" ) end end } diff --git a/test/unit/online_notifiaction_test.rb b/test/unit/online_notifiaction_test.rb index 10646a313..8456db4ec 100644 --- a/test/unit/online_notifiaction_test.rb +++ b/test/unit/online_notifiaction_test.rb @@ -337,7 +337,7 @@ class OnlineNotificationTest < ActiveSupport::TestCase end } #puts "--- #{onine_notifications.inspect}" - assert( hit, "online notification exists not #{ check_item.inspect }" ) + assert( hit, "online notification exists not #{check_item.inspect}" ) } end diff --git a/test/unit/store_test.rb b/test/unit/store_test.rb index 52cb5ad0c..e409a6143 100644 --- a/test/unit/store_test.rb +++ b/test/unit/store_test.rb @@ -49,7 +49,7 @@ class StoreTest < ActiveSupport::TestCase # sha check sha_new = Digest::SHA256.hexdigest( attachments[0].content ) - assert_equal( sha, sha_new, "check file #{ file[:filename] }") + assert_equal( sha, sha_new, "check file #{file[:filename]}") # filename check assert_equal( file[:filename], attachments[0].filename ) @@ -75,7 +75,7 @@ class StoreTest < ActiveSupport::TestCase # sha check sha_new = Digest::SHA256.hexdigest( attachments[0].content ) - assert_equal( sha, sha_new, "check file #{ file[:filename] }") + assert_equal( sha, sha_new, "check file #{file[:filename]}") # filename check assert_equal( file[:filename], attachments[0].filename ) @@ -101,7 +101,7 @@ class StoreTest < ActiveSupport::TestCase # sha check sha_new = Digest::SHA256.hexdigest( attachments[0].content ) - assert_equal( sha, sha_new, "check file #{ file[:filename] }") + assert_equal( sha, sha_new, "check file #{file[:filename]}") # filename check assert_equal( file[:filename], attachments[0].filename ) diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb index 7a290f453..e3fac8588 100644 --- a/test/unit/tag_test.rb +++ b/test/unit/tag_test.rb @@ -106,9 +106,9 @@ class TagTest < ActiveSupport::TestCase list = Tag.tag_list( tags ) test[:verify][:items].each {|key, value| if value == true - assert( list.include?( key ), "Tag verify - should exists but exists #{ key }") + assert( list.include?( key ), "Tag verify - should exists but exists #{key}") else - assert( !list.include?( key ), "Tag verify - exists but should not #{ key }") + assert( !list.include?( key ), "Tag verify - exists but should not #{key}") end } } diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 0992d91e9..a23afd6e0 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -255,15 +255,15 @@ class UserTest < ActiveSupport::TestCase test[:create_verify].each { |key, value| next if key == :image_md5 if user.respond_to?( key ) - assert_equal( value, user.send(key), "create check #{ key } in (#{ test[:name] })" ) + assert_equal( value, user.send(key), "create check #{key} in (#{test[:name]})" ) else - assert_equal( value, user[key], "create check #{ key } in (#{ test[:name] })" ) + assert_equal( value, user[key], "create check #{key} in (#{test[:name]})" ) end } if test[:create_verify][:image_md5] file = Avatar.get_by_hash( user.image ) file_md5 = Digest::MD5.hexdigest( file.content ) - assert_equal( test[:create_verify][:image_md5], file_md5, "create avatar md5 check in (#{ test[:name] })" ) + assert_equal( test[:create_verify][:image_md5], file_md5, "create avatar md5 check in (#{test[:name]})" ) end if test[:update] user.update_attributes( test[:update] ) @@ -271,16 +271,16 @@ class UserTest < ActiveSupport::TestCase test[:update_verify].each { |key, value| next if key == :image_md5 if user.respond_to?( key ) - assert_equal( value, user.send(key), "update check #{ key } in (#{ test[:name] })" ) + assert_equal( value, user.send(key), "update check #{key} in (#{test[:name]})" ) else - assert_equal( value, user[key], "update check #{ key } in (#{ test[:name] })" ) + assert_equal( value, user[key], "update check #{key} in (#{test[:name]})" ) end } if test[:update_verify][:image_md5] file = Avatar.get_by_hash( user.image ) file_md5 = Digest::MD5.hexdigest( file.content ) - assert_equal( test[:update_verify][:image_md5], file_md5, "update avatar md5 check in (#{ test[:name] })" ) + assert_equal( test[:update_verify][:image_md5], file_md5, "update avatar md5 check in (#{test[:name]})" ) end end