flickrie 0.5.2 → 0.6.0

data/test/license_test.rb

@@ -1,5 +1,3 @@
-require 'test'
-
 Flickrie::License.instance_eval do
   def public_response_array
     response_array
@@ -7,19 +5,15 @@ Flickrie::License.instance_eval do
 end
 
 class LicenseTest < Test::Unit::TestCase
-  def test_licenses_staying_the_same
-    licenses_array = Flickrie.client.get_licenses.body['licenses']['license']
-    assert_equal licenses_array.sort_by { |hash| hash['id'] },
-      Flickrie::License.public_response_array
-  end
-
   def test_get_licenses
-    licenses = Flickrie.get_licenses
+    VCR.use_cassette 'license/get_licenses' do
+      licenses = Flickrie.get_licenses
 
-    licenses.each do |license|
-      assert_includes ('0'..'8'), license.id
-      assert_instance_of String, license.name
-      assert_instance_of String, license.url
+      licenses.each do |license|
+        assert_includes ('0'..'8'), license.id
+        assert_instance_of String, license.name
+        assert_instance_of String, license.url
+      end
     end
   end
 end

data/test/location_test.rb

@@ -1,6 +1,8 @@
-require 'test'
-
 class LocationTest < Test::Unit::TestCase
+  def setup
+    @media_id = 6946979188
+  end
+
   def test_attributes_returning_nil
     location = Flickrie::Location.new
 
@@ -17,4 +19,11 @@ class LocationTest < Test::Unit::TestCase
     assert_nil location.region
     assert_nil location.country
   end
+
+  def test_square_brackets
+    VCR.use_cassette 'location/square_brackets' do
+      media = Flickrie.get_media_info(@media_id)
+      assert_equal media.location['woeid'], media.location.woeid
+    end
+  end
 end

data/test/media_count_test.rb

@@ -1,17 +1,25 @@
-require 'test'
-
 class MediaCountTest < Test::Unit::TestCase
-  def test_get_media_count
-    dates = [DateTime.parse("1st March 2012"), DateTime.parse("5th May 2012")].map(&:to_time)
+  def test_get
+    VCR.use_cassette 'media_count/get' do
+      dates = [DateTime.parse("1st March 2012"), DateTime.parse("5th May 2012")].map(&:to_time)
+
+      count = Flickrie.get_media_counts(:taken_dates => dates.join(',')).first
+      assert_instance_of Fixnum, count.value
+      assert_equal dates.first, count.date_range.begin
+      assert_equal dates.last, count.date_range.end
 
-    count = Flickrie.get_media_counts(:taken_dates => dates.join(',')).first
-    assert_instance_of Fixnum, count.value
-    assert_equal dates.first, count.date_range.begin
-    assert_equal dates.last, count.date_range.end
+      count = Flickrie.get_media_counts(:dates => dates.map(&:to_i).join(',')).first
+      assert_instance_of Fixnum, count.value
+      assert_equal dates.first, count.date_range.begin
+      assert_equal dates.last, count.date_range.end
+    end
+  end
 
-    count = Flickrie.get_media_counts(:dates => dates.map(&:to_i).join(',')).first
-    assert_instance_of Fixnum, count.value
-    assert_equal dates.first, count.date_range.begin
-    assert_equal dates.last, count.date_range.end
+  def test_square_brackets
+    VCR.use_cassette 'media_count/square_brackets' do
+      dates = [DateTime.parse("1st March 2012"), DateTime.parse("5th May 2012")].map(&:to_time)
+      count = Flickrie.get_media_counts(:taken_dates => dates.join(',')).first
+      assert_equal '1', count['count']
+    end
   end
 end