From 603e6e21b5eb8f28ff2776d8c969edccfe2c9e39 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 18 Apr 2014 16:17:29 +0530 Subject: [PATCH] test fixes --- .travis.yml | 2 +- erpnext/setup/doctype/company/.txt | 0 erpnext/setup/doctype/item_group/item_group.py | 1 - test_sites/test_site/site_config.json | 5 +++-- 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 erpnext/setup/doctype/company/.txt diff --git a/.travis.yml b/.travis.yml index d1600411fb..4ac996a612 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: cd ./test_sites/ && frappe --reinstall test_site && frappe --install_app erpnext test_site --verbose && - frappe --request '?cmd=erpnext.setup.page.setup_wizard.setup_wizard.setup_account¤cy=USD&first_name=Test&last_name=User&company_name=Wind+Power+LLC&timezone=America/New_York&company_abbr=WP&industry=Manufacturing&country=United states&fy_start_date=2014-01-01&fy_end_date=2014-12-31&language=english' test_site && + frappe --request '?cmd=erpnext.setup.page.setup_wizard.setup_wizard.setup_account¤cy=USD&first_name=Test&last_name=User&company_name=Wind+Power+LLC&timezone=America/New_York&company_abbr=WP&industry=Manufacturing&country=United states&fy_start_date=2014-01-01&fy_end_date=2014-12-31&language=english&company_tagline=Testing&email=test@erpnext.com&password=test' test_site && frappe --verbose --run_tests test_site --app erpnext before_script: diff --git a/erpnext/setup/doctype/company/.txt b/erpnext/setup/doctype/company/.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py index 980beab046..91a5efc1ba 100644 --- a/erpnext/setup/doctype/item_group/item_group.py +++ b/erpnext/setup/doctype/item_group/item_group.py @@ -14,7 +14,6 @@ class ItemGroup(NestedSet, WebsiteGenerator): self.name = self.item_group_name def validate(self): - super(ItemGroup, self).on_update() if not self.parent_website_route: self.parent_website_route = frappe.get_website_route("Item Group", self.parent_item_group) diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json index d8b937638d..ef88f5e559 100644 --- a/test_sites/test_site/site_config.json +++ b/test_sites/test_site/site_config.json @@ -1,4 +1,5 @@ { - "db_name": "travis", - "db_password": "travis" + "db_name": "travis", + "db_password": "travis", + "mute_emails": 1 }