coverband 5.2.5 → 5.2.6.rc.2

data/lib/coverband/integrations/background.rb

@@ -38,8 +38,7 @@ module Coverband
             # if deferred is set also sleep frst to spread load
             sleep(sleep_seconds.to_i) if Coverband.configuration.defer_eager_loading_data?
             Coverband.report_coverage
-            Coverband.configuration.view_tracker&.report_views_tracked
-            Coverband.configuration.route_tracker&.report_routes_tracked
+            Coverband.configuration.trackers.each { |tracker| tracker.save_report }
             if Coverband.configuration.verbose
               logger.debug("Coverband: background reporting coverage (#{Coverband.configuration.store.type}). Sleeping #{sleep_seconds}s")
             end

data/lib/coverband/reporters/web.rb

@@ -36,45 +36,49 @@ module Coverband
         return [401, {"www-authenticate" => 'Basic realm=""'}, [""]] unless check_auth
 
         request_path_info = request.path_info == "" ? "/" : request.path_info
-        if request.post?
-          case request_path_info
-          when %r{\/clear_route_tracking_route}
-            clear_route_tracking_route
-          when %r{\/clear_route_tracking}
-            clear_route_tracking
-          when %r{\/clear_view_tracking_file}
-            clear_view_tracking_file
-          when %r{\/clear_view_tracking}
-            clear_view_tracking
-          when %r{\/clear_file}
-            clear_file
-          when %r{\/clear}
-            clear
-          else
-            [404, {"Content-Type" => "text/html"}, ["404 error!"]]
+        tracker_route = false
+        Coverband.configuration.trackers.each do |tracker|
+          if request_path_info.match(tracker.class::REPORT_ROUTE)
+            tracker_route = true
+            if request_path_info =~ %r{\/clear_.*_key}
+              return clear_abstract_tracking_key(tracker)
+            elsif request_path_info =~ %r{\/clear_.*}
+              return clear_abstract_tracking(tracker)
+            else
+              return [200, {"Content-Type" => "text/html"}, [display_abstract_tracker(tracker)]]
+            end
           end
-        else
-          case request_path_info
-          when /.*\.(css|js|gif|png)/
-            @static.call(env)
-          when %r{\/settings}
-            [200, {"Content-Type" => "text/html"}, [settings]]
-          when %r{\/view_tracker_data}
-            [200, {"Content-Type" => "text/json"}, [view_tracker_data]]
-          when %r{\/view_tracker}
-            [200, {"Content-Type" => "text/html"}, [view_tracker]]
-          when %r{\/route_tracker}
-            [200, {"Content-Type" => "text/html"}, [route_tracker]]
-          when %r{\/enriched_debug_data}
-            [200, {"Content-Type" => "text/json"}, [enriched_debug_data]]
-          when %r{\/debug_data}
-            [200, {"Content-Type" => "text/json"}, [debug_data]]
-          when %r{\/load_file_details}
-            [200, {"Content-Type" => "text/json"}, [load_file_details]]
-          when %r{\/$}
-            [200, {"Content-Type" => "text/html"}, [index]]
+        end
+
+        unless tracker_route
+          if request.post?
+            case request_path_info
+            when %r{\/clear_file}
+              clear_file
+            when %r{\/clear}
+              clear
+            else
+              [404, {"Content-Type" => "text/html"}, ["404 error!"]]
+            end
           else
-            [404, {"Content-Type" => "text/html"}, ["404 error!"]]
+            case request_path_info
+            when /.*\.(css|js|gif|png)/
+              @static.call(env)
+            when %r{\/settings}
+              [200, {"Content-Type" => "text/html"}, [settings]]
+            when %r{\/view_tracker_data}
+              [200, {"Content-Type" => "text/json"}, [view_tracker_data]]
+            when %r{\/enriched_debug_data}
+              [200, {"Content-Type" => "text/json"}, [enriched_debug_data]]
+            when %r{\/debug_data}
+              [200, {"Content-Type" => "text/json"}, [debug_data]]
+            when %r{\/load_file_details}
+              [200, {"Content-Type" => "text/json"}, [load_file_details]]
+            when %r{\/$}
+              [200, {"Content-Type" => "text/html"}, [index]]
+            else
+              [404, {"Content-Type" => "text/html"}, ["404 error!"]]
+            end
           end
         end
       end
@@ -93,24 +97,17 @@ module Coverband
         Coverband::Utils::HTMLFormatter.new(nil, base_path: base_path).format_settings!
       end
 
-      def view_tracker
+      def display_abstract_tracker(tracker)
         notice = "<strong>Notice:</strong> #{Rack::Utils.escape_html(request.params["notice"])}<br/>"
         notice = request.params["notice"] ? notice : ""
         Coverband::Utils::HTMLFormatter.new(nil,
+          tracker: tracker,
           notice: notice,
-          base_path: base_path).format_view_tracker!
-      end
-
-      def route_tracker
-        notice = "<strong>Notice:</strong> #{Rack::Utils.escape_html(request.params["notice"])}<br/>"
-        notice = request.params["notice"] ? notice : ""
-        Coverband::Utils::HTMLFormatter.new(nil,
-          notice: notice,
-          base_path: base_path).format_route_tracker!
+          base_path: base_path).format_abstract_tracker!
       end
 
       def view_tracker_data
-        Coverband::Collectors::ViewTracker.new(store: Coverband.configuration.store).as_json
+        Coverband::Collectors::ViewTracker.new.as_json
       end
 
       def debug_data
@@ -154,50 +151,25 @@ module Coverband
         [302, {"Location" => "#{base_path}?notice=#{notice}"}, []]
       end
 
-      def clear_view_tracking
-        if Coverband.configuration.web_enable_clear
-          tracker = Coverband::Collectors::ViewTracker.new(store: Coverband.configuration.store)
-          tracker.reset_recordings
-          notice = "view tracking reset"
-        else
-          notice = "web_enable_clear isn't enabled in your configuration"
-        end
-        [302, {"Location" => "#{base_path}/view_tracker?notice=#{notice}"}, []]
-      end
-
-      def clear_view_tracking_file
-        if Coverband.configuration.web_enable_clear
-          tracker = Coverband::Collectors::ViewTracker.new(store: Coverband.configuration.store)
-          filename = request.params["filename"]
-          tracker.clear_file!(filename)
-          notice = "coverage for file #{filename} cleared"
-        else
-          notice = "web_enable_clear isn't enabled in your configuration"
-        end
-        [302, {"Location" => "#{base_path}/view_tracker?notice=#{notice}"}, []]
-      end
-
-      def clear_route_tracking
+      def clear_abstract_tracking(tracker)
         if Coverband.configuration.web_enable_clear
-          tracker = Coverband::Collectors::RouteTracker.new(store: Coverband.configuration.store)
           tracker.reset_recordings
-          notice = "route tracking reset"
+          notice = "#{tracker.title} tracking reset"
         else
           notice = "web_enable_clear isn't enabled in your configuration"
         end
-        [302, {"Location" => "#{base_path}/route_tracker?notice=#{notice}"}, []]
+        [302, {"Location" => "#{base_path}/#{tracker.route}?notice=#{notice}"}, []]
       end
 
-      def clear_route_tracking_route
+      def clear_abstract_tracking_key(tracker)
         if Coverband.configuration.web_enable_clear
-          tracker = Coverband::Collectors::RouteTracker.new(store: Coverband.configuration.store)
-          route = request.params["route"]
-          tracker.clear_route!(route)
-          notice = "coverage for route #{route} cleared"
+          key = request.params["key"]
+          tracker.clear_key!(key)
+          notice = "coverage for #{tracker.title} #{key} cleared"
         else
           notice = "web_enable_clear isn't enabled in your configuration"
         end
-        [302, {"Location" => "#{base_path}/route_tracker?notice=#{notice}"}, []]
+        [302, {"Location" => "#{base_path}/#{tracker.route}?notice=#{notice}"}, []]
       end
 
       private
@@ -211,7 +183,7 @@ module Coverband
       # %r{\/.*\/}.match?(request.path) ? request.path.match("\/.*\/")[0] : "/"
       # ^^ the above is NOT valid Ruby 2.3/2.4 even though rubocop / standard think it is
       def base_path
-        request.path =~ %r{\/.*\/} ? request.path.match("\/.*\/")[0] : "/"
+        request.path =~ %r{\/.*\/} ? request.path.match("/.*/")[0] : "/"
       end
     end
   end

data/lib/coverband/utils/html_formatter.rb

@@ -13,11 +13,12 @@ require "time"
 module Coverband
   module Utils
     class HTMLFormatter
-      attr_reader :notice, :base_path
+      attr_reader :notice, :base_path, :tracker
 
       def initialize(report, options = {})
-        @notice = options.fetch(:notice) { nil }
-        @base_path = options.fetch(:base_path) { "./" }
+        @notice = options.fetch(:notice, nil)
+        @base_path = options.fetch(:base_path, "./")
+        @tracker = options.fetch(:tracker, nil)
         @coverage_result = Coverband::Utils::Results.new(report) if report
       end
 
@@ -33,12 +34,8 @@ module Coverband
         format_settings
       end
 
-      def format_view_tracker!
-        format_view_tracker
-      end
-
-      def format_route_tracker!
-        format_route_tracker
+      def format_abstract_tracker!
+        template("abstract_tracker").result(binding)
       end
 
       def format_source_file!(filename)
@@ -57,14 +54,6 @@ module Coverband
         template("settings").result(binding)
       end
 
-      def format_view_tracker
-        template("view_tracker").result(binding)
-      end
-
-      def format_route_tracker
-        template("route_tracker").result(binding)
-      end
-
       def format(result)
         Dir[File.join(File.dirname(__FILE__), "../../../public/*")].each do |path|
           FileUtils.cp_r(path, asset_output_path)
@@ -109,7 +98,7 @@ module Coverband
       end
 
       def button(url, title, opts = {})
-        delete = opts.fetch(:delete) { false }
+        delete = opts.fetch(:delete, false)
         button_css = delete ? "coveraband-button del" : "coveraband-button"
         button = "<form action='#{url}' class='coverband-admin-form' method='post'>"
         button += "<button class='#{button_css}' type='submit'>#{title}</button>"

data/lib/coverband/utils/railtie.rb

@@ -27,44 +27,7 @@ module Coverband
         Coverband.runtime_coverage!
       end
 
-      begin
-        if Coverband.configuration.track_routes
-          if Gem::Version.new(Rails.version) >= Gem::Version.new("6.0.0") && Gem::Version.new(Rails.version) < Gem::Version.new("7.1.0")
-            require_relative "rails6_ext"
-          end
-
-          Coverband.configuration.route_tracker = Coverband::Collectors::RouteTracker.new
-
-          ActiveSupport::Notifications.subscribe("start_processing.action_controller") do |name, start, finish, id, payload|
-            Coverband.configuration.route_tracker.track_routes(name, start, finish, id, payload)
-          end
-
-          # NOTE: This event was instrumented in Aug 10th 2022, but didn't make the 7.0.4 release and should be in the next release
-          # https://github.com/rails/rails/pull/43755
-          # Automatic tracking of redirects isn't avaible before Rails 7.1.0 (currently tested against the 7.1.0.alpha)
-          # We could consider back porting or patching a solution that works on previous Rails versions
-          ActiveSupport::Notifications.subscribe("redirect.action_dispatch") do |name, start, finish, id, payload|
-            Coverband.configuration.route_tracker.track_routes(name, start, finish, id, payload)
-          end
-        end
-
-        if Coverband.configuration.track_views
-          COVERBAND_VIEW_TRACKER = if Coverband.coverband_service?
-            Coverband::Collectors::ViewTrackerService.new
-          else
-            Coverband::Collectors::ViewTracker.new
-          end
-
-          Coverband.configuration.view_tracker = COVERBAND_VIEW_TRACKER
-
-          ActiveSupport::Notifications.subscribe(/render_(template|partial|collection).action_view/) do |name, start, finish, id, payload|
-            COVERBAND_VIEW_TRACKER.track_views(name, start, finish, id, payload) unless name.include?("!")
-          end
-        end
-      rescue Redis::CannotConnectError => error
-        Coverband.configuration.logger.info "Redis is not available (#{error}), Coverband not configured"
-        Coverband.configuration.logger.info "If this is a setup task like assets:precompile feel free to ignore"
-      end
+      Coverband.configuration.railtie!
     end
 
     config.before_configuration do

data/lib/coverband/version.rb

@@ -5,5 +5,5 @@
 # use format "4.2.1.rc.1" ~> 4.2.1.rc to prerelease versions like v4.2.1.rc.2 and v4.2.1.rc.3
 ###
 module Coverband
-  VERSION = "5.2.5"
+  VERSION = "5.2.6.rc.2"
 end

data/lib/coverband.rb

@@ -16,9 +16,11 @@ require "coverband/adapters/stdout_store"
 require "coverband/adapters/null_store"
 require "coverband/utils/file_hasher"
 require "coverband/collectors/coverage"
+require "coverband/collectors/abstract_tracker"
 require "coverband/collectors/view_tracker"
 require "coverband/collectors/view_tracker_service"
 require "coverband/collectors/route_tracker"
+require "coverband/collectors/translation_tracker"
 require "coverband/reporters/base"
 require "coverband/reporters/console_report"
 require "coverband/integrations/background"

data/test/coverband/collectors/route_tracker_test.rb

@@ -23,7 +23,7 @@ class RouterTrackerTest < Minitest::Test
     assert_equal nil, tracker.target.first
     assert !tracker.store.nil?
     assert_equal [], tracker.target
-    assert_equal [], tracker.logged_routes
+    assert_equal [], tracker.logged_keys
   end
 
   test "track redirect routes" do
@@ -35,9 +35,9 @@ class RouterTrackerTest < Minitest::Test
     payload = {
       request: Payload.new("path", "GET")
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash], tracker.logged_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash], tracker.logged_keys
   end
 
   test "track controller routes" do
@@ -52,9 +52,9 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash], tracker.logged_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash], tracker.logged_keys
   end
 
   test "report used routes" do
@@ -68,9 +68,9 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash.to_s], tracker.used_routes.keys
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash.to_s], tracker.used_keys.keys
   end
 
   test "report unused routes" do
@@ -97,9 +97,9 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [app_routes.first], tracker.unused_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [app_routes.first], tracker.unused_keys
   end
 
   test "report unused routes pulls out parameterized routes" do
@@ -120,9 +120,9 @@ class RouterTrackerTest < Minitest::Test
       path: "some/controller/123",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [], tracker.unused_routes
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [], tracker.unused_keys
   end
 
   test "reset store" do
@@ -135,9 +135,9 @@ class RouterTrackerTest < Minitest::Test
       method: "GET"
     }
     store.raw_store.expects(:del).with(tracker_key)
-    store.raw_store.expects(:del).with("route_tracker_time")
+    store.raw_store.expects(:del).with("RouteTracker_tracker_time")
     tracker = Coverband::Collectors::RouteTracker.new(store: store, roots: "dir")
-    tracker.track_routes("name", "start", "finish", "id", payload)
+    tracker.track_key(payload)
     tracker.reset_recordings
   end
 
@@ -152,10 +152,10 @@ class RouterTrackerTest < Minitest::Test
       path: "path",
       method: "GET"
     }
-    tracker.track_routes("name", "start", "finish", "id", payload)
-    tracker.report_routes_tracked
-    assert_equal [route_hash.to_s], tracker.used_routes.keys
-    tracker.clear_route!(route_hash.to_s)
+    tracker.track_key(payload)
+    tracker.save_report
+    assert_equal [route_hash.to_s], tracker.used_keys.keys
+    tracker.clear_key!(route_hash.to_s)
     assert_equal [], tracker.store.raw_store.hgetall(tracker_key).keys
   end
 

data/test/coverband/collectors/translation_tracker_test.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require File.expand_path("../../test_helper", File.dirname(__FILE__))
+require "ostruct"
+
+class TranslationTrackerTest < Minitest::Test
+  # NOTE: using struct vs open struct as open struct has a special keyword method that overshadows the method value on Ruby 2.x
+  Payload = Struct.new(:path, :method)
+
+  def tracker_key
+    Coverband::Collectors::TranslationTracker.expects(:supported_version?).at_least_once.returns(true)
+    Coverband::Collectors::TranslationTracker.new.send(:tracker_key)
+  end
+
+  def tracker_time_key
+    Coverband::Collectors::TranslationTracker.expects(:supported_version?).at_least_once.returns(true)
+    Coverband::Collectors::TranslationTracker.new.send(:tracker_time_key)
+  end
+
+  def setup
+    super
+    fake_store.raw_store.del(tracker_key)
+  end
+
+  test "init correctly" do
+    Coverband::Collectors::TranslationTracker.expects(:supported_version?).returns(true)
+    tracker = Coverband::Collectors::TranslationTracker.new(store: fake_store, roots: "dir")
+    assert_equal nil, tracker.target.first
+    assert !tracker.store.nil?
+    assert_equal [], tracker.target
+    assert_equal [], tracker.logged_keys
+  end
+
+  test "track standard translation keys" do
+    store = fake_store
+    translation_key = "en.views.pagination.truncate"
+    store.raw_store.expects(:hset).with(tracker_key, translation_key, anything)
+    tracker = Coverband::Collectors::TranslationTracker.new(store: store, roots: "dir")
+
+    tracker.track_key(translation_key.to_sym)
+    tracker.save_report
+    assert_equal [translation_key.to_sym], tracker.logged_keys
+  end
+
+  test "report used_keys" do
+    store = fake_store
+    translation_key = "en.views.pagination.truncate"
+    tracker = Coverband::Collectors::TranslationTracker.new(store: store, roots: "dir")
+    tracker.track_key(:"en.views.pagination.truncate")
+    tracker.save_report
+    assert_equal [translation_key], tracker.used_keys.keys
+  end
+
+  test "report unused_keys" do
+    store = fake_store
+    app_keys = [
+      "en.views.pagination.truncate",
+      "en.views.pagination.next"
+    ]
+    tracker = Coverband::Collectors::TranslationTracker.new(store: store, roots: "dir", target: app_keys)
+    tracker.track_key(:"en.views.pagination.truncate")
+    tracker.save_report
+    assert_equal [app_keys.last], tracker.unused_keys
+  end
+
+  test "reset store" do
+    store = fake_store
+    store.raw_store.expects(:del).with(tracker_key)
+    store.raw_store.expects(:del).with(tracker_time_key)
+    tracker = Coverband::Collectors::TranslationTracker.new(store: store, roots: "dir")
+    tracker.track_key(:"en.views.pagination.truncate")
+    tracker.reset_recordings
+  end
+
+  test "clear_key" do
+    store = fake_store
+    translation_key = "en.views.pagination.truncate"
+    tracker = Coverband::Collectors::TranslationTracker.new(store: store, roots: "dir")
+    tracker.track_key(translation_key.to_sym)
+    tracker.save_report
+    assert_equal [translation_key.to_s], tracker.used_keys.keys
+    tracker.clear_key!(translation_key.to_s)
+    assert_equal [], tracker.store.raw_store.hgetall(tracker_key).keys
+  end
+
+  protected
+
+  def fake_store
+    @fake_store ||= Coverband::Adapters::RedisStore.new(Coverband::Test.redis, redis_namespace: "coverband_test")
+  end
+end

data/test/coverband/collectors/view_tracker_test.rb

@@ -4,7 +4,7 @@ require File.expand_path("../../test_helper", File.dirname(__FILE__))
 
 class ViewTrackerTest < Minitest::Test
   def tracker_key
-    "render_tracker_2"
+    "ViewTracker_tracker"
   end
 
   def setup
@@ -18,7 +18,7 @@ class ViewTrackerTest < Minitest::Test
     assert_equal "dir", tracker.roots.first
     assert !tracker.store.nil?
     assert_equal [], tracker.target
-    assert_equal [], tracker.logged_views
+    assert_equal [], tracker.logged_keys
   end
 
   test "track partials" do
@@ -27,9 +27,9 @@ class ViewTrackerTest < Minitest::Test
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     store.raw_store.expects(:hset).with(tracker_key, file_path, anything)
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.logged_views
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.logged_keys
   end
 
   test "track partials that include the word vendor in the path" do
@@ -37,9 +37,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/vendor_relations/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.used_views.keys
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.used_keys.keys
   end
 
   test "track partials that include the word _mailer in the path" do
@@ -47,9 +47,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/_mailer/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.used_views.keys
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.used_keys.keys
   end
 
   test "ignore partials that include the folder vendor in the path" do
@@ -57,9 +57,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/vendor/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal({}, tracker.used_views)
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal({}, tracker.used_keys)
   end
 
   test "track layouts" do
@@ -68,9 +68,9 @@ class ViewTrackerTest < Minitest::Test
     file_path = "#{File.expand_path(Coverband.configuration.root)}/layout"
     store.raw_store.expects(:hset).with(tracker_key, file_path, anything)
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", layout: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.logged_views
+    tracker.track_key(layout: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.logged_keys
   end
 
   test "report used partials" do
@@ -78,9 +78,9 @@ class ViewTrackerTest < Minitest::Test
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal [file_path], tracker.used_views.keys
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal [file_path], tracker.used_keys.keys
   end
 
   test "report unused partials" do
@@ -89,30 +89,30 @@ class ViewTrackerTest < Minitest::Test
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     target = [file_path, "not_used"]
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir", target: target)
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.report_views_tracked
-    assert_equal ["not_used"], tracker.unused_views
+    tracker.track_key(identifier: file_path)
+    tracker.save_report
+    assert_equal ["not_used"], tracker.unused_keys
   end
 
   test "reset store" do
     Coverband::Collectors::ViewTracker.expects(:supported_version?).returns(true)
     store = fake_store
     store.raw_store.expects(:del).with(tracker_key)
-    store.raw_store.expects(:del).with("render_tracker_time")
+    store.raw_store.expects(:del).with("ViewTracker_tracker_time")
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: "file")
+    tracker.track_key(identifier: "file")
     tracker.reset_recordings
   end
 
-  test "clear_file" do
+  test "clear_key" do
     Coverband::Collectors::ViewTracker.expects(:supported_version?).returns(true)
     store = fake_store
     file_path = "#{File.expand_path(Coverband.configuration.root)}/file"
     store.raw_store.expects(:hdel).with(tracker_key, file_path)
     tracker = Coverband::Collectors::ViewTracker.new(store: store, roots: "dir")
-    tracker.track_views("name", "start", "finish", "id", identifier: file_path)
-    tracker.clear_file!("file")
-    assert_equal [], tracker.logged_views
+    tracker.track_key(identifier: file_path)
+    tracker.clear_key!("file")
+    assert_equal [], tracker.logged_keys
   end
 
   protected