Merge pull request #3 from pyembed/test-improvements

Test improvements

.gitignore

@@ -200,6 +200,7 @@ var/
 sdist/
 develop-eggs/
 .installed.cfg
+.eggs/
 
 # Installer logs
 pip-log.txt

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: python
 python:
 - '2.7'

pyembed/mustache/test/integration_test.py

@@ -21,15 +21,16 @@
 # THE SOFTWARE.
 
 from pyembed.core import PyEmbed
-from hamcrest import assert_that, equal_to
-
 from pyembed.mustache import MustacheRenderer
 
+import vcr
+
 
+@vcr.use_cassette('pyembed/mustache/test/fixtures/cassettes/embed_template.yml')
 def test_should_embed_with_mustache_template():
     renderer = MustacheRenderer('pyembed/mustache/test/fixtures')
     embedding = PyEmbed(renderer=renderer).embed(
         'http://www.youtube.com/watch?v=qrO4YZeyl0I')
-    assert_that(embedding, equal_to(
-        'Lady Gaga - Bad Romance by LadyGagaVEVO from ' +
-        'http://www.youtube.com/watch?v=qrO4YZeyl0I'))
+    assert embedding == \
+        'Lady Gaga - Bad Romance by LadyGagaVEVO from ' + \
+        'http://www.youtube.com/watch?v=qrO4YZeyl0I'

pyembed/mustache/test/mustache_test.py

@@ -22,8 +22,6 @@
 
 from pyembed.core import response
 
-from hamcrest import assert_that, equal_to
-
 from pyembed.mustache import MustacheRenderer
 
 
@@ -36,10 +34,8 @@ def test_default_embed_photo():
 
     oembed_response = response.OEmbedPhotoResponse(
         create_value_function(values))
-    assert_that(
-        MustacheRenderer('.').render('http://example.com', oembed_response),
-        equal_to('<img src="http://example.com/bees.jpg" ' +
-                 'width="300" height="200" />'))
+    assert MustacheRenderer('.').render('http://example.com', oembed_response) == \
+        '<img src="http://example.com/bees.jpg" width="300" height="200" />'
 
 
 def test_default_embed_video():
@@ -50,9 +46,7 @@ def test_default_embed_video():
 
     oembed_response = response.OEmbedVideoResponse(
         create_value_function(values))
-    assert_that(
-        MustacheRenderer('.').render('http://example.com', oembed_response),
-        equal_to(embedding))
+    assert MustacheRenderer('.').render('http://example.com', oembed_response) == embedding
 
 
 def test_default_embed_rich():
@@ -63,9 +57,7 @@ def test_default_embed_rich():
 
     oembed_response = response.OEmbedRichResponse(
         create_value_function(values))
-    assert_that(
-        MustacheRenderer('.').render('http://example.com', oembed_response),
-        equal_to(embedding))
+    assert MustacheRenderer('.').render('http://example.com', oembed_response) == embedding
 
 
 def test_default_embed_link():
@@ -74,9 +66,8 @@ def test_default_embed_link():
 
     oembed_response = response.OEmbedLinkResponse(
         create_value_function(values))
-    assert_that(
-        MustacheRenderer('.').render('http://example.com', oembed_response),
-        equal_to('<a href="http://example.com">Bees!</a>'))
+    assert MustacheRenderer('.').render('http://example.com', oembed_response) == \
+        '<a href="http://example.com">Bees!</a>'
 
 
 def test_should_embed_with_template():
@@ -91,8 +82,7 @@ def test_should_embed_with_template():
     renderer = MustacheRenderer('pyembed/mustache/test/fixtures')
     embedding = renderer.render('http://example.com', oembed_response)
 
-    assert_that(embedding, equal_to(
-        'Bees by Ian Bees from http://example.com'))
+    assert embedding == 'Bees by Ian Bees from http://example.com'
 
 
 def test_should_use_default_embedding_if_no_template():
@@ -105,9 +95,7 @@ def test_should_use_default_embedding_if_no_template():
         create_value_function(values))
     renderer = MustacheRenderer('pyembed/mustache/test/fixtures')
 
-    assert_that(
-        renderer.render('http://example.com', oembed_response),
-        equal_to(embedding))
+    assert renderer.render('http://example.com', oembed_response) == embedding
 
 
 def create_value_function(values):

setup.py

@@ -65,9 +65,9 @@ def run_tests(self):
         'pystache'
     ],
     tests_require=[
-        'PyHamcrest',
         'mock',
-        'pytest'
+        'pytest',
+        'vcrpy'
     ],
 
     cmdclass={'test': PyTest},

tox.ini

@@ -0,0 +1,7 @@
+[tox]
+envlist = py27, py34
+
+[testenv]
+commands = python setup.py test
+deps =
+    setuptools>=17.1