Merge branch 'master' of github.com:ox-it/talks.ox

* 'master' of github.com:ox-it/talks.ox: documenting the mailto closes #216 Wait for list group item to appear in test
ox-it · Jan 16, 2015 · 8c620a8 · 8c620a8
2 parents feff53a + 4e703e8
commit 8c620a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/docs/source/user/talk-editors/formatting-the-abstract.rst b/docs/source/user/talk-editors/formatting-the-abstract.rst
@@ -34,10 +34,16 @@ The **Abstract** field uses the Textile markup language - the basics are very ea
 
 **Links**
 
+A web address should convert into a link automatically when you save the talk. To give the link a title rather than just show the web address:
+
+::
+
+     "Oxford University":http://www.ox.ac.uk 
+
+To make an email clickable use the following:
+
 ::
 
-     "Link Title":http://www.ox.ac.uk  
-     "$":http://www.ox.ac.uk
      "$":mailto:joe.blogs@ox.ac.uk
 
 If you need more, there is a comprehensive manual on `txstyle.org <http://txstyle.org>`_ 

diff --git a/tests/add_series.robot b/tests/add_series.robot
@@ -26,7 +26,7 @@ Scenario: Create Person inline
     type "James Bond" into ${series create person name}
     type "MI5" into ${series create person bio}
     click on ${series create person submit}
-    ${list group item("James Bond, MI5")} should be displayed
+    ${list group item("James Bond, MI5")} should appear
     click on ${button done}
     page should contain text "James Bond (MI5)"