summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/toaster/tests/browser/test_all_projects_page.py13
-rw-r--r--bitbake/lib/toaster/tests/browser/test_sample.py2
2 files changed, 9 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/tests/browser/test_all_projects_page.py b/bitbake/lib/toaster/tests/browser/test_all_projects_page.py
index ed8e620db4..44da640751 100644
--- a/bitbake/lib/toaster/tests/browser/test_all_projects_page.py
+++ b/bitbake/lib/toaster/tests/browser/test_all_projects_page.py
@@ -93,7 +93,7 @@ class TestAllProjectsPage(SeleniumTestCase):
93 """ 93 """
94 url = reverse('all-projects') 94 url = reverse('all-projects')
95 self.get(url) 95 self.get(url)
96 self.wait_until_visible('#no-results-projectstable') 96 self.wait_until_visible('#empty-state-projectstable')
97 97
98 rows = self.find_all('#projectstable tbody tr') 98 rows = self.find_all('#projectstable tbody tr')
99 self.assertEqual(len(rows), 0, 'should be no projects displayed') 99 self.assertEqual(len(rows), 0, 'should be no projects displayed')
@@ -122,12 +122,13 @@ class TestAllProjectsPage(SeleniumTestCase):
122 self._add_non_default_project() 122 self._add_non_default_project()
123 123
124 self.get(reverse('all-projects')) 124 self.get(reverse('all-projects'))
125 self.wait_until_visible("#projectstable tr")
125 126
126 # find the row for the default project 127 # find the row for the default project
127 default_project_row = self._get_row_for_project(self.default_project.name) 128 default_project_row = self._get_row_for_project(self.default_project.name)
128 129
129 # check the release text for the default project 130 # check the release text for the default project
130 selector = 'span[data-project-field="release"] span.muted' 131 selector = 'span[data-project-field="release"] span.text-muted'
131 element = default_project_row.find_element_by_css_selector(selector) 132 element = default_project_row.find_element_by_css_selector(selector)
132 text = element.text.strip() 133 text = element.text.strip()
133 self.assertEqual(text, 'Not applicable', 134 self.assertEqual(text, 'Not applicable',
@@ -137,7 +138,7 @@ class TestAllProjectsPage(SeleniumTestCase):
137 other_project_row = self._get_row_for_project(self.project.name) 138 other_project_row = self._get_row_for_project(self.project.name)
138 139
139 # check the link in the release cell for the other project 140 # check the link in the release cell for the other project
140 selector = 'span[data-project-field="release"] a' 141 selector = 'span[data-project-field="release"]'
141 element = other_project_row.find_element_by_css_selector(selector) 142 element = other_project_row.find_element_by_css_selector(selector)
142 text = element.text.strip() 143 text = element.text.strip()
143 self.assertEqual(text, self.release.name, 144 self.assertEqual(text, self.release.name,
@@ -156,11 +157,13 @@ class TestAllProjectsPage(SeleniumTestCase):
156 157
157 self.get(reverse('all-projects')) 158 self.get(reverse('all-projects'))
158 159
160 self.wait_until_visible("#projectstable tr")
161
159 # find the row for the default project 162 # find the row for the default project
160 default_project_row = self._get_row_for_project(self.default_project.name) 163 default_project_row = self._get_row_for_project(self.default_project.name)
161 164
162 # check the machine cell for the default project 165 # check the machine cell for the default project
163 selector = 'span[data-project-field="machine"] span.muted' 166 selector = 'span[data-project-field="machine"] span.text-muted'
164 element = default_project_row.find_element_by_css_selector(selector) 167 element = default_project_row.find_element_by_css_selector(selector)
165 text = element.text.strip() 168 text = element.text.strip()
166 self.assertEqual(text, 'Not applicable', 169 self.assertEqual(text, 'Not applicable',
@@ -170,7 +173,7 @@ class TestAllProjectsPage(SeleniumTestCase):
170 other_project_row = self._get_row_for_project(self.project.name) 173 other_project_row = self._get_row_for_project(self.project.name)
171 174
172 # check the link in the machine cell for the other project 175 # check the link in the machine cell for the other project
173 selector = 'span[data-project-field="machine"] a' 176 selector = 'span[data-project-field="machine"]'
174 element = other_project_row.find_element_by_css_selector(selector) 177 element = other_project_row.find_element_by_css_selector(selector)
175 text = element.text.strip() 178 text = element.text.strip()
176 self.assertEqual(text, self.MACHINE_NAME, 179 self.assertEqual(text, self.MACHINE_NAME,
diff --git a/bitbake/lib/toaster/tests/browser/test_sample.py b/bitbake/lib/toaster/tests/browser/test_sample.py
index 7bb8b97e8c..20ec53c28a 100644
--- a/bitbake/lib/toaster/tests/browser/test_sample.py
+++ b/bitbake/lib/toaster/tests/browser/test_sample.py
@@ -37,5 +37,5 @@ class TestSample(SeleniumTestCase):
37 def test_landing_page_has_brand(self): 37 def test_landing_page_has_brand(self):
38 url = reverse('landing') 38 url = reverse('landing')
39 self.get(url) 39 self.get(url)
40 brand_link = self.find('span.brand a') 40 brand_link = self.find('.toaster-navbar-brand a.brand')
41 self.assertEqual(brand_link.text.strip(), 'Toaster') 41 self.assertEqual(brand_link.text.strip(), 'Toaster')