Merge pull request #168 from AresMUSH/dev

Version 1.0.10

Gemfile

@@ -12,7 +12,7 @@ gem 'em-websocket', '~> 0.5'
 gem 'i18n', '~>  1.14'
 gem 'log4r', '~> 1.1.10'
 gem 'rake', '~> 12.3'
-gem 'rspec', '~> 3.7.0'
+gem 'rspec', '~> 3.12'
 gem 'timezone', '~> 1.2.10'
 gem 'dentaku', '~>3.1'
 gem 'json', '~> 2.3.1'

Gemfile.lock

@@ -80,19 +80,19 @@ GEM
     redcarpet (3.5.1)
     redic (1.5.3)
       hiredis
-    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)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     ruby2_keywords (0.0.5)
     rubyzip (1.3.0)
     sassc (2.4.0)
@@ -139,7 +139,7 @@ DEPENDENCIES
   rack (>= 2.2.6)
   rake (~> 12.3)
   redcarpet (~> 3.5.1)
-  rspec (~> 3.7.0)
+  rspec (~> 3.12)
   rubyzip (~> 1.3.0)
   sassc (~> 2.4.0)
   sinatra (~> 2.2.3)

spec/locale/locale_specs.rb

@@ -70,7 +70,7 @@ module AresMUSH
       it "should pass along variables in the string" do
         args = { :arg => "the arg" }
         expect(I18n).to receive(:t).with('hello arg', args) { "Hello World with the arg!" }
-        t('hello arg', args )
+        t('hello arg', :arg => "the arg" )
       end      
     end
 
@@ -82,13 +82,13 @@ module AresMUSH
 
       it "should return the I18n localization of a date" do
         date = Date.new
-        expect(I18n).to receive(:l).with(date, {}) { "abc" }
+        expect(I18n).to receive(:l).with(date) { "abc" }
         expect(l(date)).to eq "abc"
       end
 
       it "should return the I18n localization of a time" do
         time = Time.new
-        expect(I18n).to receive(:l).with(time, {}) { "abc" }
+        expect(I18n).to receive(:l).with(time) { "abc" }
         expect(l(time)).to eq "abc"
       end
     end

spec/models/game_specs.rb

@@ -6,7 +6,7 @@ module AresMUSH
 
   describe Game do
     describe :master do
-      it "should return the master game object" do
+      it "xxx should return the master game object" do
         model = double
         allow(Game).to receive(:[]).with(1) { model }
         expect(Game.master).to eq model

version.txt

@@ -1 +1 @@
-1.0.9
+1.0.10