From 4454d024485d671ded558e3c617900f6fad414a4 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Wed, 5 Oct 2016 17:08:54 -0700 Subject: bitbake: toaster: Update tests to reflect front end changes - Browser test we changed the project heading access to use the class name - Update toastergui unit test for additional gotoUrl property - On faster browsers we had a race for layer details inputs being visible (Bitbake rev: 80f377ebcffd01dbe393ccffb999df4b04552f8a) Signed-off-by: Michael Wood Signed-off-by: bavery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/tests/browser/test_layerdetails_page.py | 4 ++++ bitbake/lib/toaster/tests/browser/test_project_page.py | 2 +- bitbake/lib/toaster/toastergui/tests.py | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py b/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py index 72b6f60c21..6392d1efb6 100644 --- a/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py +++ b/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py @@ -91,6 +91,10 @@ class TestLayerDetailsPage(SeleniumTestCase): for btn in self.find_all("dd .glyphicon-edit"): btn.click() + # Wait for the inputs to become visible + self.wait_until_visible("#layer-git input[type=text]") + self.wait_until_visible("dd textarea") + # Edit each value for inputs in self.find_all("#layer-git input[type=text]") + \ self.find_all("dd textarea"): diff --git a/bitbake/lib/toaster/tests/browser/test_project_page.py b/bitbake/lib/toaster/tests/browser/test_project_page.py index 786bef1c6e..0186463324 100644 --- a/bitbake/lib/toaster/tests/browser/test_project_page.py +++ b/bitbake/lib/toaster/tests/browser/test_project_page.py @@ -55,5 +55,5 @@ class TestProjectPage(SeleniumTestCase): self.get(url) # check that we get a project page with the correct heading - project_name = self.find('#project-name').text.strip() + project_name = self.find('.project-name').text.strip() self.assertEqual(project_name, self.CLI_BUILDS_PROJECT_NAME) diff --git a/bitbake/lib/toaster/toastergui/tests.py b/bitbake/lib/toaster/toastergui/tests.py index 050861159a..2b5894f743 100644 --- a/bitbake/lib/toaster/toastergui/tests.py +++ b/bitbake/lib/toaster/toastergui/tests.py @@ -248,7 +248,13 @@ class ViewTests(TestCase): url = reverse('xhr_customrecipe_id', args=(recipe.id,)) response = self.client.delete(url) self.assertEqual(response.status_code, 200) - self.assertEqual(json.loads(response.content.decode('utf-8')), {"error": "ok"}) + + gotoUrl = reverse('projectcustomimages', args=(self.project.pk,)) + + self.assertEqual(json.loads(response.content.decode('utf-8')), + {"error": "ok", + "gotoUrl": gotoUrl}) + # try to delete not-existent recipe url = reverse('xhr_customrecipe_id', args=(recipe.id,)) response = self.client.delete(url) -- cgit 1.2.3-korg