Merge branch 'pr/460' into develop

sigmavirus24 · sigmavirus24 · commit 136f51ea7054 · 2015-11-07T22:21:46.000-06:00
diff --git a/github3/github.py b/github3/github.py
@@ -355,7 +355,10 @@ def emojis(self):
                 }
         """
         url = self._build_url('emojis')
-        return self._json(self._get(url), 200)
+        data = self._json(self._get(url), 200)
+        del data['ETag']
+        del data['Last-Modified']
+        return data
 
     @requires_basic_auth
     def feeds(self):
diff --git a/tests/integration/test_github.py b/tests/integration/test_github.py
@@ -95,6 +95,15 @@ def test_emojis(self):
         # Asserts that it's a string and looks ilke the URLs we expect to see
         assert emojis['+1'].startswith('https://github')
 
+    def test_emojis_etag(self):
+        """Test the ability to retrieve from /emojis."""
+        cassette_name = self.cassette_name('emojis')
+        with self.recorder.use_cassette(cassette_name):
+            emojis = self.gh.emojis()
+
+        assert 'ETag' not in emojis
+        assert 'Last-Modified' not in emojis
+
     def test_feeds(self):
         """Test the ability to retrieve a user's timelime URLs."""
         self.basic_login()
