test_helper: fakeweb test helper

4 files changed, 26 insertions, 30 deletions

diff --git a/test/day_entry_test.rb b/test/day_entry_test.rb
index 2dd036c..baa4f3b 100644
--- a/test/day_entry_test.rb
+++ b/test/day_entry_test.rb
@@ -2,25 +2,23 @@ require 'test_helper'
 
 class DayEntryTest < HCl::TestCase
   def test_all_today_empty
-    FakeWeb.register_uri(:get, %r{/daily$}, body: Yajl::Encoder.encode({projects:[],day_entries:[]}))
+    register_uri(:get, '/daily', {projects:[],day_entries:[]})
     assert HCl::DayEntry.all.empty?
   end
 
   def test_all_today
-    FakeWeb.register_uri(:get, %r{/daily$}, body: Yajl::Encoder.encode({
-      projects:[], day_entries:[{id:1,note:'hi'}]}))
+    register_uri(:get, '/daily', {projects:[], day_entries:[{id:1,note:'hi'}]})
     assert_equal 'hi', HCl::DayEntry.all.first.note
   end
 
   def test_all_with_date
-    FakeWeb.register_uri(:get, %r{/daily/013/2013$}, body: Yajl::Encoder.encode({
-      projects:[], day_entries:[{id:1,note:'hi'}]}))
+    register_uri(:get, '/daily/013/2013', {projects:[], day_entries:[{id:1,note:'hi'}]})
     assert_equal 'hi', HCl::DayEntry.all(Date.civil(2013,1,13)).first.note
   end
 
   def test_toggle
     entry = HCl::DayEntry.new(id:123)
-    FakeWeb.register_uri(:get, %r{/daily/timer/123$}, body:'hi'.inspect)
+    register_uri(:get, '/daily/timer/123', {note:'hi'})
     entry.toggle
   end
   def test_cancel_success
diff --git a/test/net_test.rb b/test/net_test.rb
index e00d16a..882a09f 100644
--- a/test/net_test.rb
+++ b/test/net_test.rb
@@ -10,11 +10,10 @@ class NetTest < HCl::TestCase
   end
 
   def test_http_deep_unescape
-    FakeWeb.register_uri(:get, "https://bob:secret@bobclock.harvestapp.com/foo",
-                         :body => Yajl::Encoder.encode({
+    register_uri(:get, "/foo", {
       status:'gotten &amp; got!',
       comparisons:['burrito &gt; taco', 'rain &lt; sun']
-    }))
+    })
     body = HCl::Net.get 'foo'
     assert_equal 'gotten & got!', body[:status]
     assert_equal 'burrito > taco', body[:comparisons][0]
@@ -22,23 +21,20 @@ class NetTest < HCl::TestCase
   end
 
   def test_http_get
-    FakeWeb.register_uri(:get, "https://bob:secret@bobclock.harvestapp.com/foo",
-                         :body => 'gotten!'.inspect)
+    register_uri(:get, "/foo", {message:'gotten!'})
     body = HCl::Net.get 'foo'
-    assert_equal 'gotten!', body
+    assert_equal 'gotten!', body[:message]
   end
 
   def test_http_post
-    FakeWeb.register_uri(:post, "https://bob:secret@bobclock.harvestapp.com/foo",
-                         :body => 'posted!'.inspect)
+    register_uri(:post, "/foo", {message:'posted!'})
     body = HCl::Net.post 'foo', {pizza:'taco'}
-    assert_equal 'posted!', body
+    assert_equal 'posted!', body[:message]
   end
 
   def test_http_delete
-    FakeWeb.register_uri(:delete, "https://bob:secret@bobclock.harvestapp.com/foo",
-                         :body => 'wiped!'.inspect)
+    register_uri(:delete, "/foo", {message:'wiped!'})
     body = HCl::Net.delete 'foo'
-    assert_equal 'wiped!', body
+    assert_equal 'wiped!', body[:message]
   end
 end
diff --git a/test/task_test.rb b/test/task_test.rb
index 47393e8..3deb620 100644
--- a/test/task_test.rb
+++ b/test/task_test.rb
@@ -21,30 +21,26 @@ class TaskTest < HCl::TestCase
 
   def test_add
     task = HCl::Task.new(id:1, project:HCl::Project.new({id:2}))
-    FakeWeb.register_uri(:post, %r{/daily/add$},
-                         body: Yajl::Encoder.encode(note:'good stuff',
-                                hours:0.2, project_id:2, task_id:1, spent_at: Date.today))
+    register_uri(:post, '/daily/add', {
+      note:'good stuff', hours:0.2, project_id:2, task_id:1, spent_at: Date.today})
     entry = task.add(note:'good stuff', starting_time:0.2)
     assert_equal 'good stuff', entry.note
   end
 
   def test_start_running
     task = HCl::Task.new(id:1, project:HCl::Project.new({id:2}))
-    FakeWeb.register_uri(:post, %r{/daily/add$},
-                         body: Yajl::Encoder.encode(note:'good stuff',
-                                timer_started_at:DateTime.now,
-                                hours:0.2, project_id:2, task_id:1, spent_at: Date.today))
+    register_uri(:post, '/daily/add', {
+      note:'good stuff', timer_started_at:DateTime.now,
+      hours:0.2, project_id:2, task_id:1, spent_at: Date.today})
     entry = task.start(note:'good stuff', starting_time:0.2)
     assert_equal 'good stuff', entry.note
   end
 
   def test_start_then_toggle
     task = HCl::Task.new(id:1, project:HCl::Project.new({id:2}))
-    FakeWeb.register_uri(:post, %r{/daily/add$},
-                         body: Yajl::Encoder.encode(id:123, note:'woot'))
-    FakeWeb.register_uri(:get, %r{/daily/timer/123$},
-                         body: Yajl::Encoder.encode(note:'good stuff',
-                                hours:0.2, project_id:2, task_id:1, spent_at: Date.today))
+    register_uri(:post, '/daily/add', {id:123, note:'woot'})
+    register_uri(:get, '/daily/timer/123', {note:'good stuff', hours:0.2,
+                                            project_id:2, task_id:1, spent_at: Date.today})
     entry = task.start(note:'good stuff', starting_time:0.2)
     assert_equal 'good stuff', entry.note
   end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index e8c1657..47d3517 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -36,6 +36,12 @@ class HCl::TestCase < MiniTest::Unit::TestCase
       'subdomain' => 'bobclock',
       'ssl' => true
   end
+
+  def register_uri method, path, data={}
+    FakeWeb.register_uri(method, "https://bob:secret@bobclock.harvestapp.com#{path}",
+                         body: Yajl::Encoder.encode(data))
+  end
+
   def teardown
     FakeWeb.clean_registry
   end