Merge lp:~robru/gwibber/twitter-from-me-fix into lp:~barry/gwibber/py3

[Robert Bruce Park]

Minor bugfix for Twitter. I'm surprised neither of us noticed this ;-)

[Barry Warsaw (barry)]

On Oct 09, 2012, at 10:45 PM, Robert Bruce Park wrote:

>Robert Bruce Park has proposed merging lp:~robru/gwibber/twitter-from-me-fix into lp:~barry/gwibber/py3.
>
>Requested reviews:
> Barry Warsaw (barry)
>
>For more details, see:
>https://code.launchpad.net/~robru/gwibber/twitter-from-me-fix/+merge/128834
>
>Minor bugfix for Twitter. I'm surprised neither of us noticed this ;-)

Any chance you can write a test case for this? The test should fail without
the fix and pass after the fix. Feel free to use FakeData <wink>.

[lp:~robru/gwibber/twitter-from-me-fix]

1450. By Robert Bruce Park on 2012-10-10

Add a test for that id/name mixup.

[Robert Bruce Park (robru)]

Alright barry, I added a test that does indeed fail if the original commit is reverted.

=== modified file 'gwibber/gwibber/protocols/twitter.py'
--- gwibber/gwibber/protocols/twitter.py	2012-10-09 19:56:07 +0000
+++ gwibber/gwibber/protocols/twitter.py	2012-10-10 17:00:27 +0000
@@ -113,7 +113,7 @@
             stream='messages',
             sender=user.get('name', ''),
             sender_nick=screen_name,
-            from_me=(screen_name == self._account.user_id),
+            from_me=(screen_name == self._account.user_name),
             icon_uri=user.get('profile_image_url_https', ''),
             liked=tweet.get('favorited', False),
             url=self._tweet_permalink.format(user_id=screen_name,

=== added file 'gwibber/gwibber/tests/data/twitter-send.dat'
--- gwibber/gwibber/tests/data/twitter-send.dat	1970-01-01 00:00:00 +0000
+++ gwibber/gwibber/tests/data/twitter-send.dat	2012-10-10 17:00:27 +0000
@@ -0,0 +1,87 @@
+      {
+        "coordinates": null,
+        "truncated": false,
+        "created_at": "Tue Aug 28 21:16:23 +0000 2012",
+        "favorited": false,
+        "id_str": "240558470661799936",
+        "in_reply_to_user_id_str": null,
+        "entities": {
+          "urls": [
+
+          ],
+          "hashtags": [
+
+          ],
+          "user_mentions": [
+
+          ]
+        },
+        "text": "just another test",
+        "contributors": null,
+        "id": 240558470661799936,
+        "retweet_count": 0,
+        "in_reply_to_status_id_str": null,
+        "geo": null,
+        "retweeted": false,
+        "in_reply_to_user_id": null,
+        "place": null,
+        "source": "<a href=\"http://realitytechnicians.com\" rel=\"nofollow\">OAuth Dancer Reborn</a>",
+        "user": {
+          "name": "OAuth Dancer",
+          "profile_sidebar_fill_color": "DDEEF6",
+          "profile_background_tile": true,
+          "profile_sidebar_border_color": "C0DEED",
+          "profile_image_url": "http://a0.twimg.com/profile_images/730275945/oauth-dancer_normal.jpg",
+          "created_at": "Wed Mar 03 19:37:35 +0000 2010",
+          "location": "San Francisco, CA",
+          "follow_request_sent": false,
+          "id_str": "119476949",
+          "is_translator": false,
+          "profile_link_color": "0084B4",
+          "entities": {
+            "url": {
+              "urls": [
+                {
+                  "expanded_url": null,
+                  "url": "http://bit.ly/oauth-dancer",
+                  "indices": [
+                    0,
+                    26
+                  ],
+                  "display_url": null
+                }
+              ]
+            },
+            "description": null
+          },
+          "default_profile": false,
+          "url": "http://bit.ly/oauth-dancer",
+          "contributors_enabled": false,
+          "favourites_count": 7,
+          "utc_offset": null,
+          "profile_image_url_https": "https://si0.twimg.com/profile_images/730275945/oauth-dancer_normal.jpg",
+          "id": 119476949,
+          "listed_count": 1,
+          "profile_use_background_image": true,
+          "profile_text_color": "333333",
+          "followers_count": 28,
+          "lang": "en",
+          "protected": false,
+          "geo_enabled": true,
+          "notifications": false,
+          "description": "",
+          "profile_background_color": "C0DEED",
+          "verified": false,
+          "time_zone": null,
+          "profile_background_image_url_https": "https://si0.twimg.com/profile_background_images/80151733/oauth-dance.png",
+          "statuses_count": 166,
+          "profile_background_image_url": "http://a0.twimg.com/profile_background_images/80151733/oauth-dance.png",
+          "default_profile_image": false,
+          "friends_count": 14,
+          "following": false,
+          "show_all_inline_media": false,
+          "screen_name": "oauth_dancer"
+        },
+        "in_reply_to_screen_name": null,
+        "in_reply_to_status_id": null
+      }

=== modified file 'gwibber/gwibber/tests/test_twitter.py'
--- gwibber/gwibber/tests/test_twitter.py	2012-10-05 01:23:56 +0000
+++ gwibber/gwibber/tests/test_twitter.py	2012-10-10 17:00:27 +0000
@@ -48,6 +48,7 @@
     """Test the Twitter API."""
 
     def setUp(self):
+        TestModel.clear()
         self.account = FakeAccount()
         self.protocol = Twitter(self.account)
         self.log_mock = LogMock('gwibber.utils.base',
@@ -110,6 +111,8 @@
                 FakeData('gwibber.tests.data', 'twitter-home.dat'))
     @mock.patch('gwibber.protocols.twitter.Twitter._login',
                 return_value=True)
+    @mock.patch('gwibber.utils.base._seen_messages', {})
+    @mock.patch('gwibber.utils.base._seen_ids', {})
     def test_home(self, *mocks):
         self.account.access_token = 'access'
         self.account.secret_token = 'secret'
@@ -152,6 +155,37 @@
             for got, want in zip(TestModel.get_row(i), expected_row):
                 self.assertEqual(got, want)
 
+    @mock.patch('gwibber.utils.base.Model', TestModel)
+    @mock.patch('gwibber.utils.download.urlopen',
+                FakeData('gwibber.tests.data', 'twitter-send.dat'))
+    @mock.patch('gwibber.protocols.twitter.Twitter._login',
+                return_value=True)
+    @mock.patch('gwibber.utils.base._seen_messages', {})
+    @mock.patch('gwibber.utils.base._seen_ids', {})
+    def test_from_me(self, *mocks):
+        self.account.access_token = 'access'
+        self.account.secret_token = 'secret'
+        self.account.user_name = 'oauth_dancer'
+        self.account.auth.parameters = dict(
+            ConsumerKey='key',
+            ConsumerSecret='secret')
+        self.assertEqual(0, TestModel.get_n_rows())
+        self.protocol.send('some message')
+        self.assertEqual(1, TestModel.get_n_rows())
+
+        # This test data was ripped directly from Twitter's API docs.
+        expected_row = [
+            [['twitter', 'faker/than fake', '240558470661799936']],
+            'messages', 'OAuth Dancer', 'oauth_dancer', True,
+            '2012-08-28T21:16:23', 'just another test', '',
+            'https://si0.twimg.com/profile_images/730275945/oauth-dancer_normal.jpg',
+            'https://twitter.com/oauth_dancer/status/240558470661799936', '',
+            '', '', '', 0.0, False, '', '', '', '', '', '', '', '', '', '',
+            '', '', '', '', '', '', '', '', '', '', '',
+            ]
+        for got, want in zip(TestModel.get_row(0), expected_row):
+            self.assertEqual(got, want)
+
     def test_mentions(self):
         get_url = self.protocol._get_url = mock.Mock(return_value=['tweet'])
         publish = self.protocol._publish_tweet = mock.Mock()