From bf58c709df2b2ea6ca6f588d6f2de3983c528dab Mon Sep 17 00:00:00 2001 From: Gerhard Koekemoer Date: Fri, 20 Apr 2018 17:23:11 +0200 Subject: [PATCH 01/21] Start with upgrade to rails 5 --- .gitignore | 2 + .rspec | 3 +- .ruby-version | 1 + .rvmrc | 1 - Gemfile | 35 +- Gemfile.lock | 417 +++--- Guardfile | 4 +- config/application.rb | 6 +- coverage/.resultset.json | 354 ++--- coverage/index.html | 1230 ++++++++++------- fart.exe | Bin 69660 -> 0 bytes .../templates/my_controller_spec.rb.erb | 2 +- .../templates/my_model_spec.rb.erb | 2 +- .../rspec/controller/controller_spec.rb.erb | 2 +- .../rspec/scaffold/controller_spec.rb.erb | 2 +- spec/controllers/blocks_controller_spec.rb | 2 +- .../controllers/game_ships_controller_spec.rb | 2 +- spec/controllers/games_controller_spec.rb | 2 +- spec/controllers/nukes_controller_spec.rb | 2 +- spec/controllers/public_controller_spec.rb | 2 +- spec/controllers/ships_controller_spec.rb | 2 +- spec/factories.rb | 65 +- spec/models/block_spec.rb | 2 +- spec/models/game_ship_spec.rb | 2 +- spec/models/game_spec.rb | 2 +- spec/models/nuke_spec.rb | 2 +- spec/models/server_ship_spec.rb | 2 +- spec/models/ship_spec.rb | 2 +- spec/rails_helper.rb | 57 + spec/requests/blocks_spec.rb | 2 +- spec/requests/game_ships_spec.rb | 2 +- spec/requests/game_spec.rb | 2 +- spec/requests/nukes_spec.rb | 2 +- spec/routing/blocks_routing_spec.rb | 2 +- spec/routing/game_ships_routing_spec.rb | 2 +- spec/routing/games_routing_spec.rb | 2 +- spec/routing/nukes_routing_spec.rb | 2 +- spec/routing/ships_routing_spec.rb | 2 +- spec/spec_helper.rb | 132 +- spec/views/blocks/edit.html.haml_spec.rb | 2 +- spec/views/blocks/index.html.haml_spec.rb | 2 +- spec/views/blocks/new.html.haml_spec.rb | 2 +- spec/views/blocks/show.html.haml_spec.rb | 2 +- spec/views/game_ships/edit.html.haml_spec.rb | 2 +- spec/views/game_ships/index.html.haml_spec.rb | 2 +- spec/views/game_ships/new.html.haml_spec.rb | 2 +- spec/views/game_ships/show.html.haml_spec.rb | 2 +- spec/views/games/edit.html.haml_spec.rb | 2 +- spec/views/games/index.html.haml_spec.rb | 2 +- spec/views/games/new.html.haml_spec.rb | 2 +- spec/views/games/show.html.haml_spec.rb | 2 +- spec/views/nukes/edit.html.haml_spec.rb | 2 +- spec/views/nukes/index.html.haml_spec.rb | 2 +- spec/views/nukes/new.html.haml_spec.rb | 2 +- spec/views/nukes/show.html.haml_spec.rb | 2 +- spec/views/ships/edit.html.haml_spec.rb | 2 +- spec/views/ships/index.html.haml_spec.rb | 2 +- spec/views/ships/new.html.haml_spec.rb | 2 +- spec/views/ships/show.html.haml_spec.rb | 2 +- 59 files changed, 1452 insertions(+), 945 deletions(-) create mode 100644 .ruby-version delete mode 100644 .rvmrc delete mode 100644 fart.exe create mode 100644 spec/rails_helper.rb diff --git a/.gitignore b/.gitignore index 212fd48..cc5384c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ tmp/ log/ .gitkeep db/schema.rb +coverage/* +coverage/**/ \ No newline at end of file diff --git a/.rspec b/.rspec index a5a3732..c99d2e7 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1 @@ ---colour ---format Fuubar +--require spec_helper diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..73462a5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.1 diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index 65840df..0000000 --- a/.rvmrc +++ /dev/null @@ -1 +0,0 @@ -rvm use 1.9.2@battleship \ No newline at end of file diff --git a/Gemfile b/Gemfile index 1f6a5ba..9b89970 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.1.1' +gem 'rails', '5.2.0' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -13,22 +13,22 @@ gem 'rails', '3.1.1' # gem 'activerecord-sqlserver-adapter' # gem 'ruby-odbc' #end -gem "pg", "~> 0.11.0" +gem 'pg' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '~> 3.1.4' - gem 'coffee-rails', '~> 3.1.1' - gem 'uglifier', '>= 1.0.3' + gem 'sass-rails' + gem 'coffee-rails' + gem 'uglifier' end gem 'jquery-rails' -gem "haml-rails", "~> 0.3.4" -gem "haml", "~> 3.1.3" -gem "inherited_resources" -gem "stateflow" -gem "formtastic", "~> 1.2.4" +gem 'haml-rails' +gem 'haml' +gem 'inherited_resources' +gem 'stateflow' +gem 'formtastic' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' @@ -43,17 +43,16 @@ gem "formtastic", "~> 1.2.4" # gem 'ruby-debug19', :require => 'ruby-debug' group :development,:test do - gem 'simplecov', '>= 0.4.0', :require => false, :group => :test + gem 'simplecov', :require => false, :group => :test # Pretty printed test output gem 'turn', :require => false - gem "rspec-rails", "~> 2.7.0" - gem "factory_girl_rails", "~> 1.2.0" - gem "fuubar", "~> 0.0.5" + gem 'rspec-rails' + gem 'factory_bot_rails' + gem 'fuubar' #gem 'nokogiri', "~> 1.5.0" gem 'representative' - gem "guard-rspec" + gem 'guard-rspec' #gem 'guard-livereload' - gem "fakeweb" - gem "vcr" - + gem 'fakeweb' + gem 'vcr' end diff --git a/Gemfile.lock b/Gemfile.lock index 7ff4fbf..8314a4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,195 +1,280 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.1) - actionpack (= 3.1.1) - mail (~> 2.3.0) - actionpack (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - builder (~> 3.0.0) - erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.1) - rack-mount (~> 0.8.2) - rack-test (~> 0.6.1) - sprockets (~> 2.0.2) - activemodel (3.1.1) - activesupport (= 3.1.1) - builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - arel (~> 2.2.1) - tzinfo (~> 0.3.29) - activeresource (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - activesupport (3.1.1) - multi_json (~> 1.0) - ansi (1.4.1) - arel (2.2.1) - builder (3.0.0) - coffee-rails (3.1.1) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.0) + activesupport (= 5.2.0) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.0) + activesupport (= 5.2.0) + globalid (>= 0.3.6) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + builder (3.2.3) + coderay (1.1.2) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (~> 3.1.0) - coffee-script (2.2.0) + railties (>= 4.0.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.1.3) - diff-lcs (1.1.3) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + diff-lcs (1.3) + docile (1.3.0) + erubi (1.7.1) erubis (2.7.0) - execjs (1.2.9) - multi_json (~> 1.0) - factory_girl (2.1.2) - activesupport - factory_girl_rails (1.2.0) - factory_girl (~> 2.1.0) + execjs (2.7.0) + factory_bot (4.8.2) + activesupport (>= 3.0.0) + factory_bot_rails (4.8.2) + factory_bot (~> 4.8.2) railties (>= 3.0.0) fakeweb (1.3.0) - formtastic (1.2.4) - actionpack (>= 2.3.7) - activesupport (>= 2.3.7) - i18n (~> 0.4) - fuubar (0.0.6) - rspec (~> 2.0) - rspec-instafail (~> 0.1.8) - ruby-progressbar (~> 0.0.10) - guard (0.8.8) - thor (~> 0.14.6) - guard-rspec (0.5.4) - guard (>= 0.8.4) - haml (3.1.3) - haml-rails (0.3.4) - actionpack (~> 3.0) - activesupport (~> 3.0) - haml (~> 3.0) - railties (~> 3.0) - has_scope (0.5.1) - hike (1.2.1) - i18n (0.6.0) - inherited_resources (1.3.0) - has_scope (~> 0.5.0) - responders (~> 0.6.0) - jquery-rails (1.0.17) - railties (~> 3.0) - thor (~> 0.14) - json (1.6.1) - json (1.6.1-java) - mail (2.3.0) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.17.2) - multi_json (1.0.3) - nokogiri (1.5.0) - nokogiri (1.5.0-java) - nokogiri (1.5.0-x86-mingw32) - pg (0.11.0) - pg (0.11.0-x86-mingw32) - polyglot (0.3.3) - rack (1.3.5) - rack-cache (1.1) - rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) - rack (>= 1.0) - rails (3.1.1) - actionmailer (= 3.1.1) - actionpack (= 3.1.1) - activerecord (= 3.1.1) - activeresource (= 3.1.1) - activesupport (= 3.1.1) - bundler (~> 1.0) - railties (= 3.1.1) - railties (3.1.1) - actionpack (= 3.1.1) - activesupport (= 3.1.1) - rack-ssl (~> 1.3.2) + ffi (1.9.23) + formatador (0.2.5) + formtastic (3.1.5) + actionpack (>= 3.2.13) + fuubar (2.3.1) + rspec-core (~> 3.0) + ruby-progressbar (~> 1.4) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) + haml (5.0.4) + temple (>= 0.8.0) + tilt + haml-rails (1.0.0) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) + haml (>= 4.0.6, < 6.0) + html2haml (>= 1.0.1) + railties (>= 4.0.1) + has_scope (0.7.2) + actionpack (>= 4.1) + activesupport (>= 4.1) + html2haml (2.2.0) + erubis (~> 2.7.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + inherited_resources (1.8.0) + actionpack (>= 4.2, <= 5.2) + has_scope (~> 0.6) + railties (>= 4.2, <= 5.2) + responders + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (2.1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + nenv (0.3.0) + nio4r (2.3.0) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + rack (2.0.4) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) + bundler (>= 1.3.0) + railties (= 5.2.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) + method_source rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.11) - json (~> 1.4) - representative (1.0.4) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + representative (1.0.5) activesupport (>= 2.2.2) builder (>= 2.1.2) i18n (>= 0.4.1) nokogiri (>= 1.4.2) - responders (0.6.4) - rspec (2.7.0) - rspec-core (~> 2.7.0) - rspec-expectations (~> 2.7.0) - rspec-mocks (~> 2.7.0) - rspec-core (2.7.1) - rspec-expectations (2.7.0) - diff-lcs (~> 1.1.2) - rspec-instafail (0.1.9) - rspec-mocks (2.7.0) - rspec-rails (2.7.0) - actionpack (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) - rspec (~> 2.7.0) - ruby-progressbar (0.0.10) - sass (3.1.10) - sass-rails (3.1.4) - actionpack (~> 3.1.0) - railties (~> 3.1.0) - sass (>= 3.1.4) - sprockets (~> 2.0.0) - tilt (~> 1.3.2) - simplecov (0.5.4) - multi_json (~> 1.0.3) - simplecov-html (~> 0.5.3) - simplecov-html (0.5.3) - sprockets (2.0.3) - hike (~> 1.2) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rspec (3.7.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.1) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + ruby_parser (3.11.0) + sexp_processor (~> 4.9) + sass (3.5.6) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sexp_processor (4.11.0) + shellany (0.0.1) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) stateflow (0.4.2) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - turn (0.8.3) + temple (0.8.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turn (0.9.6) ansi - tzinfo (0.3.31) - uglifier (1.0.4) - execjs (>= 0.3.0) - multi_json (>= 1.0.2) - vcr (1.11.3) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.9) + execjs (>= 0.3.0, < 3) + vcr (4.0.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) PLATFORMS - java ruby - x86-mingw32 DEPENDENCIES - coffee-rails (~> 3.1.1) - factory_girl_rails (~> 1.2.0) + coffee-rails + factory_bot_rails fakeweb - formtastic (~> 1.2.4) - fuubar (~> 0.0.5) + formtastic + fuubar guard-rspec - haml (~> 3.1.3) - haml-rails (~> 0.3.4) + haml + haml-rails inherited_resources jquery-rails - pg (~> 0.11.0) - rails (= 3.1.1) + pg + rails (= 5.2.0) representative - rspec-rails (~> 2.7.0) - sass-rails (~> 3.1.4) - simplecov (>= 0.4.0) + rspec-rails + sass-rails + simplecov stateflow turn - uglifier (>= 1.0.3) + uglifier vcr + +BUNDLED WITH + 1.16.1 diff --git a/Guardfile b/Guardfile index d056954..df4ea1b 100644 --- a/Guardfile +++ b/Guardfile @@ -4,7 +4,7 @@ guard 'rspec', :version => 2 do watch(%r{^spec/.+_spec\.rb$}) watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } - watch('spec/spec_helper.rb') { "spec" } + watch('spec/rails_helper.rb') { "spec" } # Rails example watch(%r{^spec/.+_spec\.rb$}) @@ -13,7 +13,7 @@ guard 'rspec', :version => 2 do watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] } watch(%r{^spec/support/(.+)\.rb$}) { "spec" } - watch('spec/spec_helper.rb') { "spec" } + watch('spec/rails_helper.rb') { "spec" } watch('config/routes.rb') { "spec/routing" } watch('app/controllers/application_controller.rb') { "spec/controllers" } # Capybara request specs diff --git a/config/application.rb b/config/application.rb index ba86536..0b6b448 100644 --- a/config/application.rb +++ b/config/application.rb @@ -44,11 +44,7 @@ class Application < Rails::Application end # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password, :password_confirmation] - - # Enable IdentityMap for Active Record, to disable set to false or remove the line below. - config.active_record.identity_map = true - ActiveRecord::IdentityMap.enabled = true + config.filter_parameters += [:password, :password_confirmation] # Enable the asset pipeline config.assets.enabled = true diff --git a/coverage/.resultset.json b/coverage/.resultset.json index d5fb7c7..64bd74e 100644 --- a/coverage/.resultset.json +++ b/coverage/.resultset.json @@ -1,7 +1,7 @@ { "RSpec": { "coverage": { - "/home/gerhard/Desktop/projects/Battleships/app/controllers/application_controller.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/controllers/application_controller.rb": [ 1, 1, 1, @@ -9,39 +9,39 @@ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/helpers/application_helper.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/helpers/application_helper.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/helpers/blocks_helper.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/helpers/blocks_helper.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/helpers/game_ships_helper.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/helpers/game_ships_helper.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/helpers/games_helper.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/helpers/games_helper.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/helpers/nukes_helper.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/helpers/nukes_helper.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/helpers/public_helper.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/helpers/public_helper.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/helpers/ships_helper.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/helpers/ships_helper.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/controllers/blocks_controller.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/controllers/blocks_controller.rb": [ 1, null ], - "/home/gerhard/Desktop/projects/Battleships/app/models/block.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/models/block.rb": [ 1, 1, 1, @@ -68,45 +68,45 @@ null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/controllers/game_ships_controller.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/controllers/game_ships_controller.rb": [ 1, 1, 1, - 5, - 5, - 5, - 3, + 0, + 0, + 0, + 0, null, - 2, + 0, null, null, null, 1, - 2, - 2, - 2, - 2, + 0, + 0, + 0, + 0, null, null, null, 1, - 1, - 1, - 1, + 0, + 0, + 0, null, null, 1, - 4, - 4, - 4, - 2, + 0, + 0, + 0, + 0, null, - 2, + 0, null, null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/models/game_ship.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/models/game_ship.rb": [ 1, 1, 1, @@ -121,42 +121,42 @@ 1, null, 1, - 27, + 0, null, - 27, - 1, - 1, - 1, + 0, + 0, + 0, + 0, null, null, null, 1, - 26, - 2600, - 11000, - null, - 9900, + 0, + 0, + 0, null, + 0, null, - 990, - 99, - 99, - 76, null, - 72, + 0, + 0, + 0, + 0, null, + 0, null, null, null, null, - 1100, - 110, + 0, + 0, + 0, null, - 11, - 11, - 8, + 0, + 0, + 0, null, - 8, + 0, null, null, null, @@ -170,41 +170,41 @@ null, 1, null, - 6, - 6, - 3, + 0, + 0, + 0, null, null, null, null, null, 1, - 7, - 700, - 2700, - null, - 2100, + 0, + 0, + 0, null, + 0, null, - 210, - 21, - 21, - 16, null, - 12, + 0, + 0, + 0, + 0, null, + 0, null, null, null, null, - 600, - 60, + 0, + 0, + 0, null, - 6, - 6, - 4, + 0, + 0, + 0, null, - 4, + 0, null, null, null, @@ -218,44 +218,44 @@ null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/controllers/games_controller.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/controllers/games_controller.rb": [ 1, null, 1, - 1, + 0, null, - 1, - 1, - 1, + 0, + 0, + 0, null, null, 1, - 1, - 1, + 0, + 0, null, null, - 1, + 0, null, - 1, + 0, null, - 1, - 1, - 1, + 0, + 0, + 0, null, null, null, null, 1, - 1, + 0, null, null, 1, - 5, - 5, + 0, + 0, null, - 3, + 0, null, - 2, + 0, null, null, null, @@ -264,12 +264,12 @@ null, null, 1, - 5, - 5, + 0, + 0, null, - 2, + 0, null, - 3, + 0, null, null, null, @@ -277,7 +277,7 @@ null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/models/game.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/models/game.rb": [ 1, 1, 1, @@ -288,7 +288,7 @@ null, 1, 1, - 23, + 0, null, null, 1, @@ -310,28 +310,28 @@ null, 1, null, - 62, - 620, - 6200, + 0, + 0, + 0, null, null, - 62, - 620, - 6200, + 0, + 0, + 0, null, null, null, null, 1, - 2, - 2, - 2, - 4, - 2, + 0, + 0, + 0, + 0, + 0, null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/controllers/nukes_controller.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/controllers/nukes_controller.rb": [ 1, null, 1, @@ -340,22 +340,22 @@ null, 1, null, - 2, - 2, - 2, + 0, + 0, + 0, null, - 2, - 1, - 1, + 0, + 0, + 0, null, - 1, + 0, null, - 1, - 1, + 0, + 0, 0, null, null, - 1, + 0, 0, 0, null, @@ -366,16 +366,16 @@ 0, null, null, - 1, + 0, null, - 1, + 0, null, null, null, null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/models/nuke.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/models/nuke.rb": [ 1, 1, 1, @@ -389,46 +389,46 @@ null, 1, null, - 23, - 23, - 9, + 0, + 0, + 0, null, - 9, + 0, null, null, - 6, - 6, + 0, + 0, null, - 6, - 6, - 6, - 6, - 6, + 0, + 0, + 0, + 0, + 0, null, null, - 6, + 0, null, null, - 6, + 0, null, null, - 3, - 3, + 0, + 0, null, null, null, - 14, - 14, - 3, - 3, - 3, - 3, + 0, + 0, + 0, + 0, + 0, + 0, null, null, - 3, + 0, null, null, - 11, + 0, null, null, null, @@ -437,24 +437,24 @@ null, null, 1, - 10, + 0, null, - 10, + 0, null, null, 1, - 2, - 2, + 0, + 0, null, - 2, - 2, - 4, + 0, + 0, + 0, null, - 2, + 0, null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/controllers/public_controller.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/controllers/public_controller.rb": [ 1, 1, null, @@ -462,28 +462,28 @@ null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/controllers/ships_controller.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/controllers/ships_controller.rb": [ 1, 1, - 5, - 5, - 3, + 0, + 0, + 0, null, - 2, + 0, null, null, null, 1, - 5, - 5, - 2, + 0, + 0, + 0, null, - 3, + 0, null, null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/models/ship.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/models/ship.rb": [ 1, 1, 1, @@ -495,12 +495,44 @@ null, null ], - "/home/gerhard/Desktop/projects/Battleships/app/models/server_ship.rb": [ + "/Users/gerhardk19/Code/Personal/Something/app/models/server_ship.rb": [ 1, 1, null + ], + "/Users/gerhardk19/Code/Personal/Something/lib/generators/my_model_spec/my_model_spec_generator.rb": [ + 0, + 0, + null, + 0, + 0, + 0, + null, + 0, + null, + 0, + 0, + 0, + null, + 0 + ], + "/Users/gerhardk19/Code/Personal/Something/lib/generators/my_controller_spec/my_controller_spec_generator.rb": [ + 0, + 0, + null, + 0, + 0, + 0, + null, + 0, + null, + 0, + 0, + 0, + null, + 0 ] }, - "timestamp": 1328799094 + "timestamp": 1524218872 } } diff --git a/coverage/index.html b/coverage/index.html index 88cbafb..203812b 100644 --- a/coverage/index.html +++ b/coverage/index.html @@ -1,49 +1,40 @@ - Code coverage for Battleships + Code coverage for Something - - - - - - - - - - - - - + + + +
- loading + loading