From 5076f3d8f8b229f621f8646612a911084f619bec Mon Sep 17 00:00:00 2001 From: luigi Date: Mon, 13 Nov 2017 17:46:11 +0100 Subject: [PATCH] Add magic comment to freeze String literals (#907) * Add magic comment to frozen String literals --- lib/capybara/poltergeist.rb | 2 ++ lib/capybara/poltergeist/browser.rb | 2 ++ lib/capybara/poltergeist/client.rb | 2 ++ lib/capybara/poltergeist/command.rb | 4 +++- lib/capybara/poltergeist/cookie.rb | 2 ++ lib/capybara/poltergeist/driver.rb | 2 ++ lib/capybara/poltergeist/errors.rb | 2 ++ lib/capybara/poltergeist/inspector.rb | 2 ++ lib/capybara/poltergeist/network_traffic.rb | 2 ++ lib/capybara/poltergeist/network_traffic/error.rb | 2 ++ lib/capybara/poltergeist/network_traffic/request.rb | 2 ++ lib/capybara/poltergeist/network_traffic/response.rb | 2 ++ lib/capybara/poltergeist/node.rb | 2 ++ lib/capybara/poltergeist/server.rb | 2 ++ lib/capybara/poltergeist/utility.rb | 2 ++ lib/capybara/poltergeist/version.rb | 2 ++ lib/capybara/poltergeist/web_socket_server.rb | 2 ++ spec/integration/driver_spec.rb | 2 ++ spec/integration/session_spec.rb | 2 ++ spec/spec_helper.rb | 2 ++ spec/support/spec_logger.rb | 2 ++ spec/support/test_app.rb | 2 ++ spec/support/views/long_page.erb | 2 +- spec/support/views/unwanted.erb | 2 +- spec/support/views/url_blacklist.erb | 2 +- spec/support/views/with_ajax_fail.erb | 2 +- spec/support/views/with_different_resources.erb | 2 +- spec/unit/browser_spec.rb | 2 ++ spec/unit/client_spec.rb | 2 ++ spec/unit/driver_spec.rb | 2 ++ spec/unit/inspector_spec.rb | 2 ++ 31 files changed, 58 insertions(+), 6 deletions(-) diff --git a/lib/capybara/poltergeist.rb b/lib/capybara/poltergeist.rb index a62f63e..f4eb70b 100644 --- a/lib/capybara/poltergeist.rb +++ b/lib/capybara/poltergeist.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + if RUBY_VERSION < "1.9.2" raise "This version of Capybara/Poltergeist does not support Ruby versions " \ "less than 1.9.2." diff --git a/lib/capybara/poltergeist/browser.rb b/lib/capybara/poltergeist/browser.rb index 6fbb80a..a962758 100644 --- a/lib/capybara/poltergeist/browser.rb +++ b/lib/capybara/poltergeist/browser.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "capybara/poltergeist/errors" require "capybara/poltergeist/command" require 'json' diff --git a/lib/capybara/poltergeist/client.rb b/lib/capybara/poltergeist/client.rb index b2af8ff..809a6d7 100644 --- a/lib/capybara/poltergeist/client.rb +++ b/lib/capybara/poltergeist/client.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "timeout" require "capybara/poltergeist/utility" require 'cliver' diff --git a/lib/capybara/poltergeist/command.rb b/lib/capybara/poltergeist/command.rb index fd10119..35a3ffd 100644 --- a/lib/capybara/poltergeist/command.rb +++ b/lib/capybara/poltergeist/command.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'securerandom' module Capybara::Poltergeist @@ -16,4 +18,4 @@ module Capybara::Poltergeist JSON.dump({ 'id' => @id, 'name' => @name, 'args' => @args }) end end -end \ No newline at end of file +end diff --git a/lib/capybara/poltergeist/cookie.rb b/lib/capybara/poltergeist/cookie.rb index 47ff156..3de38fe 100644 --- a/lib/capybara/poltergeist/cookie.rb +++ b/lib/capybara/poltergeist/cookie.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist class Cookie def initialize(attributes) diff --git a/lib/capybara/poltergeist/driver.rb b/lib/capybara/poltergeist/driver.rb index ea70dbd..81f954f 100644 --- a/lib/capybara/poltergeist/driver.rb +++ b/lib/capybara/poltergeist/driver.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'uri' module Capybara::Poltergeist diff --git a/lib/capybara/poltergeist/errors.rb b/lib/capybara/poltergeist/errors.rb index a8785b5..4dda584 100644 --- a/lib/capybara/poltergeist/errors.rb +++ b/lib/capybara/poltergeist/errors.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara module Poltergeist class Error < StandardError; end diff --git a/lib/capybara/poltergeist/inspector.rb b/lib/capybara/poltergeist/inspector.rb index 0f4f3cf..7896f11 100644 --- a/lib/capybara/poltergeist/inspector.rb +++ b/lib/capybara/poltergeist/inspector.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist class Inspector BROWSERS = %w(chromium chromium-browser google-chrome open) diff --git a/lib/capybara/poltergeist/network_traffic.rb b/lib/capybara/poltergeist/network_traffic.rb index 193e3de..0816c66 100644 --- a/lib/capybara/poltergeist/network_traffic.rb +++ b/lib/capybara/poltergeist/network_traffic.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist module NetworkTraffic require 'capybara/poltergeist/network_traffic/request' diff --git a/lib/capybara/poltergeist/network_traffic/error.rb b/lib/capybara/poltergeist/network_traffic/error.rb index 9205e89..f48e6f7 100644 --- a/lib/capybara/poltergeist/network_traffic/error.rb +++ b/lib/capybara/poltergeist/network_traffic/error.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist::NetworkTraffic class Error def initialize(data) diff --git a/lib/capybara/poltergeist/network_traffic/request.rb b/lib/capybara/poltergeist/network_traffic/request.rb index f5b8c55..62ac830 100644 --- a/lib/capybara/poltergeist/network_traffic/request.rb +++ b/lib/capybara/poltergeist/network_traffic/request.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist::NetworkTraffic class Request attr_reader :response_parts, :error diff --git a/lib/capybara/poltergeist/network_traffic/response.rb b/lib/capybara/poltergeist/network_traffic/response.rb index 9ba7c25..33b8c04 100644 --- a/lib/capybara/poltergeist/network_traffic/response.rb +++ b/lib/capybara/poltergeist/network_traffic/response.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist::NetworkTraffic class Response def initialize(data) diff --git a/lib/capybara/poltergeist/node.rb b/lib/capybara/poltergeist/node.rb index 9ab548d..8c0cf9e 100644 --- a/lib/capybara/poltergeist/node.rb +++ b/lib/capybara/poltergeist/node.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist class Node < Capybara::Driver::Node attr_reader :page_id, :id diff --git a/lib/capybara/poltergeist/server.rb b/lib/capybara/poltergeist/server.rb index e27d2be..a60fa57 100644 --- a/lib/capybara/poltergeist/server.rb +++ b/lib/capybara/poltergeist/server.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara::Poltergeist class Server attr_reader :socket, :fixed_port, :timeout, :custom_host diff --git a/lib/capybara/poltergeist/utility.rb b/lib/capybara/poltergeist/utility.rb index f5031cc..02f5ef1 100644 --- a/lib/capybara/poltergeist/utility.rb +++ b/lib/capybara/poltergeist/utility.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara module Poltergeist class << self diff --git a/lib/capybara/poltergeist/version.rb b/lib/capybara/poltergeist/version.rb index 97dae83..ca4c6c0 100644 --- a/lib/capybara/poltergeist/version.rb +++ b/lib/capybara/poltergeist/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Capybara module Poltergeist VERSION = "1.16.0" diff --git a/lib/capybara/poltergeist/web_socket_server.rb b/lib/capybara/poltergeist/web_socket_server.rb index 2cec55c..ff107e2 100644 --- a/lib/capybara/poltergeist/web_socket_server.rb +++ b/lib/capybara/poltergeist/web_socket_server.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'socket' require 'websocket/driver' diff --git a/spec/integration/driver_spec.rb b/spec/integration/driver_spec.rb index dbf6827..49955da 100644 --- a/spec/integration/driver_spec.rb +++ b/spec/integration/driver_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require 'image_size' require 'pdf/reader' diff --git a/spec/integration/session_spec.rb b/spec/integration/session_spec.rb index ab02df1..deb768e 100644 --- a/spec/integration/session_spec.rb +++ b/spec/integration/session_spec.rb @@ -1,4 +1,6 @@ # coding: utf-8 +# frozen_string_literal: true + require 'spec_helper' skip = [] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cc05afa..9c85031 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + POLTERGEIST_ROOT = File.expand_path('../..', __FILE__) $:.unshift(POLTERGEIST_ROOT + '/lib') diff --git a/spec/support/spec_logger.rb b/spec/support/spec_logger.rb index 7bc3b32..c71b971 100644 --- a/spec/support/spec_logger.rb +++ b/spec/support/spec_logger.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class SpecLogger attr_reader :messages diff --git a/spec/support/test_app.rb b/spec/support/test_app.rb index 65cb0c2..98b0eab 100644 --- a/spec/support/test_app.rb +++ b/spec/support/test_app.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'capybara/spec/test_app' class TestApp diff --git a/spec/support/views/long_page.erb b/spec/support/views/long_page.erb index ada3ed8..03a91b5 100644 --- a/spec/support/views/long_page.erb +++ b/spec/support/views/long_page.erb @@ -38,4 +38,4 @@

Praesent viverra, augue vel vestibulum gravida, diam mauris sodales massa, eget cursus nisi sem in libero. Sed convallis molestie pellentesque. Ut vel ipsum massa, sit amet cursus quam. Nullam dapibus, elit eu lobortis malesuada, tellus ante consectetur diam, eget dignissim mi ante in nisl. Mauris egestas bibendum laoreet. Morbi tincidunt feugiat magna, et rutrum lectus laoreet eget. Ut ac tortor ante. In odio tortor, rhoncus a rhoncus sed, viverra ultrices metus. Quisque mollis massa velit, cursus auctor ligula. Quisque egestas arcu erat.

Phasellus blandit velit non dolor bibendum eleifend. In lobortis metus vel lorem auctor fermentum nec pulvinar nisl. Vestibulum urna mauris, malesuada quis viverra sit amet, convallis vel arcu. Mauris quis tortor ipsum, ac cursus erat. Cras laoreet accumsan elit, sed convallis nibh scelerisque vel. Praesent nec nunc dolor, et rutrum sem. Integer sagittis imperdiet arcu, et dictum nisl mattis eget. In sapien tellus, eleifend ut accumsan id, aliquam quis risus. Cras viverra neque et augue fringilla eu malesuada felis tincidunt. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer a magna non tellus fringilla gravida sed quis justo. Cras pulvinar ultricies tincidunt. Nullam hendrerit risus id massa feugiat iaculis. Duis rhoncus ipsum dolor, ut semper dolor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.

- \ No newline at end of file + diff --git a/spec/support/views/unwanted.erb b/spec/support/views/unwanted.erb index 141e19b..c56e466 100644 --- a/spec/support/views/unwanted.erb +++ b/spec/support/views/unwanted.erb @@ -3,4 +3,4 @@ We shouldn't see this. - \ No newline at end of file + diff --git a/spec/support/views/url_blacklist.erb b/spec/support/views/url_blacklist.erb index 4c8a463..20f6587 100644 --- a/spec/support/views/url_blacklist.erb +++ b/spec/support/views/url_blacklist.erb @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/spec/support/views/with_different_resources.erb b/spec/support/views/with_different_resources.erb index a36d277..7b64d44 100644 --- a/spec/support/views/with_different_resources.erb +++ b/spec/support/views/with_different_resources.erb @@ -12,4 +12,4 @@ Go to 402 Go to 500 - \ No newline at end of file + diff --git a/spec/unit/browser_spec.rb b/spec/unit/browser_spec.rb index f649521..d95d35a 100644 --- a/spec/unit/browser_spec.rb +++ b/spec/unit/browser_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require 'stringio' diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb index 93df99b..4ba6a18 100644 --- a/spec/unit/client_spec.rb +++ b/spec/unit/client_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' module Capybara::Poltergeist diff --git a/spec/unit/driver_spec.rb b/spec/unit/driver_spec.rb index 672df17..1089c54 100644 --- a/spec/unit/driver_spec.rb +++ b/spec/unit/driver_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' module Capybara::Poltergeist diff --git a/spec/unit/inspector_spec.rb b/spec/unit/inspector_spec.rb index 2ab74ee..c75fcf4 100644 --- a/spec/unit/inspector_spec.rb +++ b/spec/unit/inspector_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' module Capybara::Poltergeist