Merge pull request #4197 from MCGallaspy/fixup-contentrec-test

Add more explicit wait in test

.gitignore

@@ -2,6 +2,9 @@
 # File created by Coverage
 .coverage
 
+# PyCharm
+.idea
+
 # Eclipse
 .project
 .pydevproject

kalite/coachreports/features/steps/coachreports.py

@@ -32,7 +32,7 @@ def step_impl(context):
     # time it's built because of /api/coachreports/summary/?facility_id
     # being super slow
     try:
-        find_id_with_wait(context, "summary_mainview", wait_time=30)
+        find_id_with_wait(context, "summary_mainview", wait_time=60)
     except TimeoutException:
         raise RuntimeError("Could not find element, this was the DOM:\n\n" + context.browser.execute_script("return document.documentElement.outerHTML"))
 

kalite/distributed/features/steps/content_recommendation.py

@@ -21,8 +21,7 @@ def impl(context):
 
 @when(u'I click on the right of an exercise suggestion on the next steps card')
 def impl(context):
-    card = find_id_with_wait(context, "nextsteps")
-    element = card.find_elements_by_tag_name("a")[1]
+    element = find_css_class_with_wait(context, "content-nextsteps-topic-link")
     click_and_wait_for_page_load(context, element, wait_time=15)
 
 @then(u'I should be taken to that topic')
@@ -31,8 +30,7 @@ def impl(context):
 
 @when(u'I click in the middle of an exercise suggestion on the next steps card')
 def impl(context):
-    card = find_id_with_wait(context, "nextsteps")
-    element = card.find_elements_by_tag_name("a")[0]
+    element = find_css_class_with_wait(context, "content-nextsteps-lesson-link")
     click_and_wait_for_page_load(context, element, wait_time=15)
 
 @then(u'the content recommendation cards should be shown')
@@ -46,8 +44,7 @@ def impl(context):
 
 @when(u'I click on a suggested topic on the explore card')
 def impl(context):
-    card = find_id_with_wait(context, "explore")
-    element = card.find_element_by_tag_name("a")
+    element = find_css_class_with_wait(context, "content-explore-topic-link")
     click_and_wait_for_page_load(context, element)
 
 @then(u'I should be taken to that exercise')
@@ -56,6 +53,5 @@ def impl(context):
 
 @when(u'I click on the resume card lesson')
 def impl(context):
-    card = find_id_with_wait(context, "resume")
-    element = card.find_element_by_tag_name("a")
+    element = find_css_class_with_wait(context, "content-resume-topic-link")
     click_and_wait_for_page_load(context, element)

kalite/distributed/static/js/distributed/contentrec/hbtemplates/content-explore-topic.handlebars

@@ -1,5 +1,5 @@
 <!--likely to be a link to the subject in the sidenav tree-->
-<a href="/learn/{{suggested_topic.path}}">
+<a href="/learn/{{suggested_topic.path}}" class="content-explore-topic-link">
   <div class="content-explore-topic">
     <div class="row">
       <div class="col-xs-12">

kalite/distributed/static/js/distributed/contentrec/hbtemplates/content-nextsteps-lesson.handlebars

@@ -1,6 +1,6 @@
 
 <div class="row" class="content-nextsteps-lesson">
-	<a href="/learn/{{ path }}">
+	<a href="/learn/{{ path }}" class="content-nextsteps-lesson-link">
       <div class="col-xs-3">
         <center>
           {{#if content_urls.thumbnail }}
@@ -21,7 +21,7 @@
     </a>
     <!--The URL without the specific video, so that we see the path
     along the nav and show them the entire series-->
-    <a href="/learn/{{ topic.path }}">
+    <a href="/learn/{{ topic.path }}" class="content-nextsteps-topic-link">
       <div class="col-xs-3">
           <h4>{{_ "Topic" }}</h4>
           <span class="ns_series_arrow glyphicon glyphicon-arrow-right" aria-hidden="true"></span>

kalite/distributed/static/js/distributed/contentrec/hbtemplates/content-resume.handlebars

@@ -9,7 +9,7 @@
     </div>
     <hr class="module_divider" />
   </div>
-  <a href="/learn/{{ path }}">
+  <a href="/learn/{{ path }}" class="content-resume-topic-link">
     <!--Where the video thumbnail and description go-->
     <div id="content-resume-thumbnail">
       {{#if content_urls.thumbnail }}