fix tests, address warnings

Author: Shaun Carlson

spec/active_remote/cached/argument_keys_spec.rb

@@ -2,24 +2,24 @@
 
 describe ::ActiveRemote::Cached::ArgumentKeys do
   it "does not mutate a string by default" do
-    ::ActiveRemote::Cached::ArgumentKeys.new("hello", {}).cache_key.must_equal("hello")
+    _(::ActiveRemote::Cached::ArgumentKeys.new("hello", {}).cache_key).must_equal("hello")
   end
 
   it "returns a string of a symbol by default" do
-    ::ActiveRemote::Cached::ArgumentKeys.new(:hello, {}).cache_key.must_equal("hello")
+    _(::ActiveRemote::Cached::ArgumentKeys.new(:hello, {}).cache_key).must_equal("hello")
   end
 
   it "does not mutate a string with special characters by default" do
-    ::ActiveRemote::Cached::ArgumentKeys.new("hello {}", {}).cache_key.must_equal("hello {}")
+    _(::ActiveRemote::Cached::ArgumentKeys.new("hello {}", {}).cache_key).must_equal("hello {}")
   end
 
   it "removes special characters from string with special characters when :active_remote_cached_remove_characters" do
     options = { :active_remote_cached_remove_characters => true }
-    ::ActiveRemote::Cached::ArgumentKeys.new("hello {}", options).cache_key.must_equal("hello")
+    _(::ActiveRemote::Cached::ArgumentKeys.new("hello {}", options).cache_key).must_equal("hello")
   end
 
   it "replaces special characters from string with special characters when :active_remote_cached_replace_characters" do
     options = { :active_remote_cached_replace_characters => true }
-    ::ActiveRemote::Cached::ArgumentKeys.new("hello {}", options).cache_key.must_equal("helloSPLBRB")
+    _(::ActiveRemote::Cached::ArgumentKeys.new("hello {}", options).cache_key).must_equal("helloSPLBRB")
   end
 end

spec/active_remote/cached/cache_spec.rb

@@ -4,32 +4,32 @@
   describe "API" do
     it "validates #delete present" do
       cache = OpenStruct.new(:write => nil, :fetch => nil, :read => nil, :exist? => nil)
-      error = lambda { ::ActiveRemote::Cached.cache(cache) }.must_raise(RuntimeError)
-      error.message.must_match(/respond_to.*delete/i)
+      error = _(lambda { ::ActiveRemote::Cached.cache(cache) }).must_raise(RuntimeError)
+      _(error.message).must_match(/respond_to.*delete/i)
     end
 
     it "validates #exist? present" do
       cache = OpenStruct.new(:write => nil, :delete => nil, :read => nil, :fetch => nil)
-      error = lambda { ::ActiveRemote::Cached.cache(cache) }.must_raise(RuntimeError)
-      error.message.must_match(/respond_to.*exist/i)
+      error = _(lambda { ::ActiveRemote::Cached.cache(cache) }).must_raise(RuntimeError)
+      _(error.message).must_match(/respond_to.*exist/i)
     end
 
     it "validates #fetch present" do
       cache = OpenStruct.new(:write => nil, :delete => nil, :read => nil, :exist? => nil)
-      error = lambda { ::ActiveRemote::Cached.cache(cache) }.must_raise(RuntimeError)
-      error.message.must_match(/respond_to.*fetch/i)
+      error = _(lambda { ::ActiveRemote::Cached.cache(cache) }).must_raise(RuntimeError)
+      _(error.message).must_match(/respond_to.*fetch/i)
     end
 
     it "validates #read present" do
       cache = OpenStruct.new(:write => nil, :delete => nil, :fetch => nil, :exist? => nil)
-      error = lambda { ::ActiveRemote::Cached.cache(cache) }.must_raise(RuntimeError)
-      error.message.must_match(/respond_to.*read/i)
+      error = _(lambda { ::ActiveRemote::Cached.cache(cache) }).must_raise(RuntimeError)
+      _(error.message).must_match(/respond_to.*read/i)
     end
 
     it "validates #write present" do
       cache = OpenStruct.new(:read => nil, :delete => nil, :fetch => nil, :exist? => nil)
-      error = lambda { ::ActiveRemote::Cached.cache(cache)}.must_raise(RuntimeError)
-      error.message.must_match(/respond_to.*write/i)
+      error = _(lambda { ::ActiveRemote::Cached.cache(cache) }).must_raise(RuntimeError)
+      _(error.message).must_match(/respond_to.*write/i)
     end
   end
 end

spec/active_remote/cached_delete_methods_spec.rb

@@ -15,31 +15,31 @@ def self.search; nil; end
 describe DeleteMethodClass do
   describe "API" do
     it "creates 'cached_delete_by_guid'" do
-      DeleteMethodClass.must_respond_to("cached_delete_by_guid")
+      _(DeleteMethodClass).must_respond_to("cached_delete_by_guid")
     end
 
     it "creates 'cached_delete_by_user_guid'" do
-      DeleteMethodClass.must_respond_to("cached_delete_by_user_guid")
+      _(DeleteMethodClass).must_respond_to("cached_delete_by_user_guid")
     end
 
     it "creates 'cached_delete_by_user_guid_and_client_guid'" do
-      DeleteMethodClass.must_respond_to("cached_delete_by_user_guid_and_client_guid")
+      _(DeleteMethodClass).must_respond_to("cached_delete_by_user_guid_and_client_guid")
     end
 
     it "creates 'cached_delete_by_client_guid_and_user_guid'" do
-      DeleteMethodClass.must_respond_to("cached_delete_by_client_guid_and_user_guid")
+      _(DeleteMethodClass).must_respond_to("cached_delete_by_client_guid_and_user_guid")
     end
 
     it "creates 'cached_delete_by_derp_and_user_guid_and_client_guid'" do
-      DeleteMethodClass.must_respond_to("cached_delete_by_derp_and_user_guid_and_client_guid")
+      _(DeleteMethodClass).must_respond_to("cached_delete_by_derp_and_user_guid_and_client_guid")
     end
 
     it "creates 'cached_delete_by_client_guid_and_derp_and_user_guid'" do
-      DeleteMethodClass.must_respond_to("cached_delete_by_client_guid_and_derp_and_user_guid")
+      _(DeleteMethodClass).must_respond_to("cached_delete_by_client_guid_and_derp_and_user_guid")
     end
 
     it "creates 'cached_delete_by_client_guid_and_user_guid_and_derp'" do
-      DeleteMethodClass.must_respond_to("cached_delete_by_client_guid_and_user_guid_and_derp")
+      _(DeleteMethodClass).must_respond_to("cached_delete_by_client_guid_and_user_guid_and_derp")
     end
   end
 end

spec/active_remote/cached_exist_methods_spec.rb

@@ -15,116 +15,116 @@ def self.search; nil; end
 describe ExistMethodClass do
   describe "API" do
     it "creates 'cached_exist_find_by_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_guid")
     end
 
     it "creates 'cached_exist_search_by_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_guid")
     end
 
     it "creates 'cached_exist_find_by_user_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_user_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_user_guid")
     end
 
     it "creates 'cached_exist_search_by_user_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_user_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_user_guid")
     end
 
     it "creates 'cached_exist_find_by_user_guid_and_client_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_user_guid_and_client_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_user_guid_and_client_guid")
     end
 
     it "creates 'cached_exist_search_by_user_guid_and_client_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_user_guid_and_client_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_user_guid_and_client_guid")
     end
 
     it "creates 'cached_exist_find_by_client_guid_and_user_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_client_guid_and_user_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_client_guid_and_user_guid")
     end
 
     it "creates 'cached_exist_search_by_client_guid_and_user_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_client_guid_and_user_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_client_guid_and_user_guid")
     end
 
     it "creates 'cached_exist_find_by_derp_and_user_guid_and_client_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_derp_and_user_guid_and_client_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_derp_and_user_guid_and_client_guid")
     end
 
     it "creates 'cached_exist_search_by_derp_and_user_guid_and_client_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_derp_and_user_guid_and_client_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_derp_and_user_guid_and_client_guid")
     end
 
     it "creates 'cached_exist_find_by_client_guid_and_derp_and_user_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_client_guid_and_derp_and_user_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_client_guid_and_derp_and_user_guid")
     end
 
     it "creates 'cached_exist_search_by_client_guid_and_derp_and_user_guid'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_client_guid_and_derp_and_user_guid")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_client_guid_and_derp_and_user_guid")
     end
 
     it "creates 'cached_exist_find_by_client_guid_and_user_guid_and_derp'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_client_guid_and_user_guid_and_derp")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_client_guid_and_user_guid_and_derp")
     end
 
     it "creates 'cached_exist_search_by_client_guid_and_user_guid_and_derp'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_client_guid_and_user_guid_and_derp")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_client_guid_and_user_guid_and_derp")
     end
 
     # ? based methods
     it "creates 'cached_exist_find_by_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_guid?")
     end
 
     it "creates 'cached_exist_search_by_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_guid?")
     end
 
     it "creates 'cached_exist_find_by_user_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_user_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_user_guid?")
     end
 
     it "creates 'cached_exist_search_by_user_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_user_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_user_guid?")
     end
 
     it "creates 'cached_exist_find_by_user_guid_and_client_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_user_guid_and_client_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_user_guid_and_client_guid?")
     end
 
     it "creates 'cached_exist_search_by_user_guid_and_client_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_user_guid_and_client_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_user_guid_and_client_guid?")
     end
 
     it "creates 'cached_exist_find_by_client_guid_and_user_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_client_guid_and_user_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_client_guid_and_user_guid?")
     end
 
     it "creates 'cached_exist_search_by_client_guid_and_user_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_client_guid_and_user_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_client_guid_and_user_guid?")
     end
 
     it "creates 'cached_exist_find_by_derp_and_user_guid_and_client_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_derp_and_user_guid_and_client_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_derp_and_user_guid_and_client_guid?")
     end
 
     it "creates 'cached_exist_search_by_derp_and_user_guid_and_client_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_derp_and_user_guid_and_client_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_derp_and_user_guid_and_client_guid?")
     end
 
     it "creates 'cached_exist_find_by_client_guid_and_derp_and_user_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_client_guid_and_derp_and_user_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_client_guid_and_derp_and_user_guid?")
     end
 
     it "creates 'cached_exist_search_by_client_guid_and_derp_and_user_guid?'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_client_guid_and_derp_and_user_guid?")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_client_guid_and_derp_and_user_guid?")
     end
 
     it "creates 'cached_exist_find_by_client_guid_and_user_guid_and_derp?'" do
-      ExistMethodClass.must_respond_to("cached_exist_find_by_client_guid_and_user_guid_and_derp?")
+      _(ExistMethodClass).must_respond_to("cached_exist_find_by_client_guid_and_user_guid_and_derp?")
     end
 
     it "creates 'cached_exist_search_by_client_guid_and_user_guid_and_derp?'" do
-      ExistMethodClass.must_respond_to("cached_exist_search_by_client_guid_and_user_guid_and_derp?")
+      _(ExistMethodClass).must_respond_to("cached_exist_search_by_client_guid_and_user_guid_and_derp?")
     end
   end
 end

spec/active_remote/cached_find_methods_spec.rb

@@ -16,35 +16,35 @@ def self.search; nil; end
 describe FindMethodClass do
   describe "API" do
     it "creates 'cached_find_by_foo'" do
-      FindMethodClass.must_respond_to("cached_find_by_foo")
+      _(FindMethodClass).must_respond_to("cached_find_by_foo")
     end
 
     it "creates 'cached_find_by_guid'" do
-      FindMethodClass.must_respond_to("cached_find_by_guid")
+      _(FindMethodClass).must_respond_to("cached_find_by_guid")
     end
 
     it "creates 'cached_find_by_user_guid'" do
-      FindMethodClass.must_respond_to("cached_find_by_user_guid")
+      _(FindMethodClass).must_respond_to("cached_find_by_user_guid")
     end
 
     it "creates 'cached_find_by_user_guid_and_client_guid'" do
-      FindMethodClass.must_respond_to("cached_find_by_user_guid_and_client_guid")
+      _(FindMethodClass).must_respond_to("cached_find_by_user_guid_and_client_guid")
     end
 
     it "creates 'cached_find_by_client_guid_and_user_guid'" do
-      FindMethodClass.must_respond_to("cached_find_by_client_guid_and_user_guid")
+      _(FindMethodClass).must_respond_to("cached_find_by_client_guid_and_user_guid")
     end
 
     it "creates 'cached_find_by_derp_and_user_guid_and_client_guid'" do
-      FindMethodClass.must_respond_to("cached_find_by_derp_and_user_guid_and_client_guid")
+      _(FindMethodClass).must_respond_to("cached_find_by_derp_and_user_guid_and_client_guid")
     end
 
     it "creates 'cached_find_by_client_guid_and_derp_and_user_guid'" do
-      FindMethodClass.must_respond_to("cached_find_by_client_guid_and_derp_and_user_guid")
+      _(FindMethodClass).must_respond_to("cached_find_by_client_guid_and_derp_and_user_guid")
     end
 
     it "creates 'cached_find_by_client_guid_and_user_guid_and_derp'" do
-      FindMethodClass.must_respond_to("cached_find_by_client_guid_and_user_guid_and_derp")
+      _(FindMethodClass).must_respond_to("cached_find_by_client_guid_and_user_guid_and_derp")
     end
   end
 
@@ -60,29 +60,29 @@ def self.search; nil; end
 
     it "executes find_by_guid when cached_find with guid called" do
       FindMethodClass.stub(:find, :hello) do
-        FindMethodClass.cached_find(:guid => :guid).must_equal(:hello)
+        _(FindMethodClass.cached_find(:guid => :guid)).must_equal(:hello)
       end
     end
 
     it "executes the fetch block if not present in cache" do
       FindMethodClass.stub(:find, :hello) do
-        FindMethodClass.cached_find_by_guid(:guid).must_equal(:hello)
+        _(FindMethodClass.cached_find_by_guid(:guid)).must_equal(:hello)
       end
     end
 
     it "merges the default options in for the fetch call" do
-      ::ActiveRemote::Cached.cache.expects(:fetch).with([FindMethodClass.name, "#find", "guid"], :expires_in => 100).returns(:hello)
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([::ActiveRemote::Cached::RUBY_AND_ACTIVE_SUPPORT_VERSION, FindMethodClass.name, "#find", "guid"], { :expires_in => 100 }).returns(:hello)
 
       FindMethodClass.stub(:find, :hello) do
-        FindMethodClass.cached_find_by_guid(:guid).must_equal(:hello)
+        _(FindMethodClass.cached_find_by_guid(:guid)).must_equal(:hello)
       end
     end
 
     it "overrides the default options with local options for the fetch call" do
-      ::ActiveRemote::Cached.cache.expects(:fetch).with([FindMethodClass.name, "#find", "guid"], :expires_in => 200).returns(:hello)
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([::ActiveRemote::Cached::RUBY_AND_ACTIVE_SUPPORT_VERSION, FindMethodClass.name, "#find", "guid"], { :expires_in => 200 }).returns(:hello)
 
       FindMethodClass.stub(:find, :hello) do
-        FindMethodClass.cached_find_by_guid(:guid, :expires_in => 200).must_equal(:hello)
+        _(FindMethodClass.cached_find_by_guid(:guid, :expires_in => 200)).must_equal(:hello)
       end
     end
 
@@ -92,7 +92,7 @@ def self.search; nil; end
       end
 
       it "uses the namespace as a prefix to the cache key" do
-        ::ActiveRemote::Cached.cache.expects(:fetch).with(["MyApp", FindMethodClass.name, "#find", "guid"], :expires_in => 100).returns(:hello)
+        ::ActiveRemote::Cached.cache.expects(:fetch).with([::ActiveRemote::Cached::RUBY_AND_ACTIVE_SUPPORT_VERSION, "MyApp", FindMethodClass.name, "#find", "guid"], { :expires_in => 100 }).returns(:hello)
 
         FindMethodClass.stub(:find, :hello) do
           FindMethodClass.cached_find_by_guid(:guid)
@@ -112,18 +112,18 @@ def self.search; nil; end
     end
 
     it "overrides the default options with cached_finder options for the fetch call" do
-      ::ActiveRemote::Cached.cache.expects(:fetch).with([FindMethodClass.name, "#find", "foo"], :expires_in => 500).returns(:hello)
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([::ActiveRemote::Cached::RUBY_AND_ACTIVE_SUPPORT_VERSION, FindMethodClass.name, "#find", "foo"], { :expires_in => 500 }).returns(:hello)
 
       FindMethodClass.stub(:find, :hello) do
-        FindMethodClass.cached_find_by_foo(:foo).must_equal(:hello)
+        _(FindMethodClass.cached_find_by_foo(:foo)).must_equal(:hello)
       end
     end
 
     it "overrides the cached_finder options with local options for the fetch call" do
-      ::ActiveRemote::Cached.cache.expects(:fetch).with([FindMethodClass.name, "#find", "foo"], :expires_in => 200).returns(:hello)
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([::ActiveRemote::Cached::RUBY_AND_ACTIVE_SUPPORT_VERSION, FindMethodClass.name, "#find", "foo"], { :expires_in => 200 }).returns(:hello)
 
       FindMethodClass.stub(:find, :hello) do
-        FindMethodClass.cached_find_by_foo(:foo, :expires_in => 200).must_equal(:hello)
+        _(FindMethodClass.cached_find_by_foo(:foo, :expires_in => 200)).must_equal(:hello)
       end
     end
   end