Skip to content
Snippets Groups Projects
Commit 1a58be08 authored by Nico's avatar Nico
Browse files

Remove Container base class

parent 9833f543
No related branches found
No related tags found
1 merge request!89Refactor MainWindowContainer and others into several controllers/views
# Copyright (c) 2019 Nico Alt
# SPDX-License-Identifier: AGPL-3.0-only
# License-Filename: LICENSE.md
import os
from gi.repository import Gtk
from briar_gtk.define import RESOURCES_DIR
class Container(Gtk.Overlay):
def __init__(self):
super().__init__()
self.builder = Gtk.Builder()
def _add_from_resource(self, ui_filename):
self.builder.add_from_resource(
os.path.join(RESOURCES_DIR, ui_filename)
)
...@@ -8,7 +8,7 @@ from gi.repository import Gtk ...@@ -8,7 +8,7 @@ from gi.repository import Gtk
from briar_wrapper.models.contacts import Contacts from briar_wrapper.models.contacts import Contacts
from briar_wrapper.models.private_chat import PrivateChat from briar_wrapper.models.private_chat import PrivateChat
from briar_gtk.containers.private_chat import PrivateChatContainer from briar_gtk.private_chat_container import PrivateChatContainer
from briar_gtk.define import APP from briar_gtk.define import APP
from briar_gtk.widgets.edit_dialog import EditDialog from briar_gtk.widgets.edit_dialog import EditDialog
......
# Copyright (c) 2020 Nico Alt
# SPDX-License-Identifier: AGPL-3.0-only
# License-Filename: LICENSE.md
import os
import pytest
from briar_gtk.container import Container
MODULE = "briar_gtk.container.%s"
@pytest.mark.skipif('CI' in os.environ, reason='segmentation fault')
def test_builder_at_init(mocker):
builder_mock = mocker.patch(
MODULE % "Gtk.Builder")
Container()
builder_mock.assert_called_once()
@pytest.fixture(autouse=True)
def briar_headless_jar(is_file):
flatpak_path = "/app/share/java/briar-headless.jar"
return_values = {flatpak_path: True}
is_file.side_effect = return_values.get
return is_file
@pytest.fixture(autouse=True)
def gi_dependencies(mocker):
mocker.patch(MODULE % "Gtk")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment