/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

Commit messages never contain config options

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
1
 
# Copyright (C) 2007, 2008 John Arbash Meinel <john@arbash-meinel.com>
 
1
# Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 John Arbash Meinel <john@arbash-meinel.com>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
235
235
        dlg._on_treeview_files_cursor_changed(treeview)
236
236
        self.assertFalse(CommitDialogNoWidgets._update_per_file_info.called)
237
237
 
 
238
    def test_get_line_height(self):
 
239
        tree = self.make_branch_and_tree('tree')
 
240
        dlg = CommitDialogNoWidgets(tree)
 
241
        textview = Gtk.TextView()
 
242
        line_height = dlg.get_line_height(textview)
 
243
        self.assertIsInstance(line_height, int)
 
244
 
238
245
 
239
246
class TestCommitDialog(tests.TestCaseWithTransport):
240
247
 
1178
1185
            'post_uncommit', commitmsgs.save_commit_messages, None)
1179
1186
 
1180
1187
    def _get_file_info_dict(self, rank):
1181
 
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),
1182
 
                     dict(path='b', file_id='b-id', message='b msg %d' % rank)]
 
1188
        file_info = [dict(path='a', file_id='a-id',
 
1189
                          message='a {msg} %d' % rank),
 
1190
                     dict(path='b', file_id='b-id',
 
1191
                          message='b msg %d' % rank)]
1183
1192
        return file_info
1184
1193
 
1185
1194
    def _get_file_info_revprops(self, rank):
1187
1196
        return {'file-info': bencode.bencode(file_info_prop).decode('UTF-8')}
1188
1197
 
1189
1198
    def _get_commit_message(self):
1190
 
        return self.config.get_user_option('gtk_global_commit_message')
 
1199
        return self.config.get_user_option(
 
1200
            'gtk_global_commit_message', expand=False)
1191
1201
 
1192
1202
    def _get_file_commit_messages(self):
1193
 
        return self.config.get_user_option('gtk_file_commit_messages')
 
1203
        return self.config.get_user_option(
 
1204
            'gtk_file_commit_messages', expand=False)
1194
1205
 
1195
1206
 
1196
1207
class TestUncommitHook(TestSavedCommitMessages):
1212
1223
    def test_uncommit_one_by_one(self):
1213
1224
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1214
1225
        self.assertEquals(u'three', self._get_commit_message())
1215
 
        self.assertEquals(u'd4:a-id7:a msg 34:b-id7:b msg 3e',
 
1226
        self.assertEquals(u'd4:a-id9:a {msg} 34:b-id7:b msg 3e',
1216
1227
                          self._get_file_commit_messages())
1217
1228
 
1218
1229
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1219
1230
        self.assertEquals(u'two\n******\nthree', self._get_commit_message())
1220
 
        self.assertEquals(u'd4:a-id22:a msg 2\n******\na msg 3'
 
1231
        self.assertEquals(u'd4:a-id26:a {msg} 2\n******\na {msg} 3'
1221
1232
                          '4:b-id22:b msg 2\n******\nb msg 3e',
1222
1233
                          self._get_file_commit_messages())
1223
1234
 
1224
1235
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1225
1236
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1226
1237
                          self._get_commit_message())
1227
 
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
1228
 
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1229
 
                          self._get_file_commit_messages())
 
1238
        self.assertEquals(
 
1239
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
 
1240
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1241
            self._get_file_commit_messages())
1230
1242
 
1231
1243
    def test_uncommit_all_at_once(self):
1232
1244
        uncommit.uncommit(self.tree.branch, tree=self.tree, revno=1)
1233
1245
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1234
1246
                          self._get_commit_message())
1235
 
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
1236
 
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1237
 
                          self._get_file_commit_messages())
 
1247
        self.assertEquals(
 
1248
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
 
1249
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1250
            self._get_file_commit_messages())
1238
1251
 
1239
1252
 
1240
1253
class TestReusingSavedCommitMessages(TestSavedCommitMessages, QuestionHelpers):
1248
1261
        self.tree.add(['a'], ['a-id'])
1249
1262
        self.tree.add(['b'], ['b-id'])
1250
1263
        rev1 = self.tree.commit('one', revprops=self._get_file_info_revprops(1))
1251
 
        rev2 = self.tree.commit('two', revprops=self._get_file_info_revprops(2))
 
1264
        rev2 = self.tree.commit('two{x}',
 
1265
                                revprops=self._get_file_info_revprops(2))
1252
1266
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1253
1267
        self.build_tree_contents([('tree/a', 'new a content\n'),
1254
1268
                                  ('tree/b', 'new b content'),])
1263
1277
 
1264
1278
    def test_setup_saved_messages(self):
1265
1279
        # Check the initial setup
1266
 
        self.assertEquals(u'two', self._get_commit_message())
1267
 
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
 
1280
        self.assertEquals(u'two{x}', self._get_commit_message())
 
1281
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
1268
1282
                          self._get_file_commit_messages())
1269
1283
 
1270
1284
    def test_messages_are_reloaded(self):
1271
1285
        dlg = self._get_commit_dialog(self.tree)
1272
 
        self.assertEquals(u'two', dlg._get_global_commit_message())
 
1286
        self.assertEquals(u'two{x}', dlg._get_global_commit_message())
1273
1287
        self.assertEquals(([u'a', u'b'],
1274
1288
                           [{ 'path': 'a',
1275
 
                             'file_id': 'a-id', 'message': 'a msg 2',},
 
1289
                             'file_id': 'a-id', 'message': 'a {msg} 2',},
1276
1290
                           {'path': 'b',
1277
1291
                            'file_id': 'b-id', 'message': 'b msg 2',}],),
1278
1292
                          dlg._get_specific_files())
1287
1301
        dlg = self._get_commit_dialog(self.tree)
1288
1302
        self._set_question_yes(dlg) # Save messages
1289
1303
        dlg._do_cancel()
1290
 
        self.assertEquals(u'two', self._get_commit_message())
1291
 
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
 
1304
        self.assertEquals(u'two{x}', self._get_commit_message())
 
1305
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
1292
1306
                          self._get_file_commit_messages())
1293
1307
 
1294
1308
    def test_messages_are_cleared_on_cancel_if_required(self):