Merge branch 'feature/GUI' of https://github.com/Recondor/Fourmi into feature/GUI
This commit is contained in:
commit
c6547f0199
2
.gitignore
vendored
2
.gitignore
vendored
@ -6,6 +6,8 @@
|
||||
|
||||
#may contain authentication information
|
||||
sources.cfg
|
||||
#Another of our config files
|
||||
GUI/gui.cfg
|
||||
|
||||
#THINGS WE WOULD NEVER EVER WANT!
|
||||
#ignore thumbnails created by windows
|
||||
|
@ -14,7 +14,7 @@ install:
|
||||
|
||||
# command to run tests, e.g. python setup.py test
|
||||
script:
|
||||
- nosetests --with-coverage --cover-package=FourmiCrawler,utils tests
|
||||
- nosetests --with-coverage --cover-package=FourmiCrawler,utils,GUI tests
|
||||
|
||||
notifications:
|
||||
slack: descartes2:6sgCzx3PvrO9IIMwKxj12dDM
|
||||
|
@ -31,8 +31,11 @@ class ConfigImporter():
|
||||
return 'Name, Weight'
|
||||
|
||||
class GUI():
|
||||
def __init__(self, search, config_file='GUI/gui.cfg', sourceloader = None):
|
||||
def __init__(self, search, config_file='GUI/gui.cfg', sourceloader = None, in_source=True):
|
||||
"""Boots the window, configuration."""
|
||||
if in_source:
|
||||
current_dir = os.path.dirname(os.path.abspath(__file__))
|
||||
config_file = current_dir + '/' + config_file
|
||||
self.configurator = ConfigImporter(config_file)
|
||||
self.sourceloader = sourceloader
|
||||
self.finish_with_search = False
|
||||
|
@ -7,7 +7,7 @@ class TestGUI(unittest.TestCase):
|
||||
pass
|
||||
|
||||
def test_empty_attributes(self):
|
||||
self.test_gui = gui.GUI(None, '../GUI/gui.cfg')
|
||||
self.test_gui = gui.GUI(None, '../GUI/gui.cfg.sample', in_source=False)
|
||||
self.test_gui.window.after(9, self.test_gui.prepare_search)
|
||||
self.test_gui.window.after(11, self.test_gui.window.destroy)
|
||||
self.test_gui.run()
|
||||
|
Reference in New Issue
Block a user