Merge pull request #7 from brome-hq/dev

Dev

brome/core/model/basetest.py

@@ -7,11 +7,16 @@
 import pickle
 from urlparse import urlparse
 
+try:
+    from castro import Castro
+except ImportError:
+    print "Castro not installed => pip install castro"
+    Castro = None
+
 from selenium import webdriver
 from selenium.webdriver.chrome.options import Options
 #from browsermobproxy import Server
 
-from castro import Castro
 from brome.core.model.utils import *
 from brome.core.model.stateful import Stateful
 from brome.core.model.proxy_driver import ProxyDriver
@@ -90,6 +95,10 @@ def __init__(self, runner, name, index, browser_config, test_batch_id):
         session.close()
 
     def start_video_recording(self):
+        if not Castro:
+            self.warning_log("Castro is not installed so session recording won't work")
+            return False
+
         if self._browser_config.get('record_session'):
             node_ip = self.pdriver.get_ip_of_node()
 

brome/unittest/test_brome/test_file.yml

@@ -1,18 +1 @@
 - wait_until_present
-- is_present
-- assert_present
-- wait_until_not_visible
-- proxy_element_list
-- is_visible
-- select_all
-- selector
-- find_hidden
-- highlight
-- assert_not_visible
-- assert_visible
-- dnd
-- wait_until_not_present
-- click
-- assert_text_equal_and_not_equal
-- assert_not_present
-- wait_until_visible

brome/webserver/templates/nav.html

@@ -28,7 +28,7 @@
     {% if current_user and current_user.is_authenticated() %}
     <ul class="nav navbar-nav navbar-right">
         <li>
-            <p class="navbar-text"><a class="navbar-link" href="{{ url_for('admin.members') }}">Logged in as {{ current_user.username }}</a></p>
+            <p class="navbar-text">Logged in as {{ current_user.username }}</p>
         </li>
         <li><a class="navbar-link" href="{{ url_for('public.logout') }}"><i class="fa fa-sign-out"></i></a></li>
 

brome/webserver/templates/public/about.html

@@ -5,7 +5,7 @@
 <div class="body-content">
     <div class="row">
       <h1>About</h1>
-      <p>This template was created by <a href="http://github.com/sloria/">Steven Loria</a> for use with the <a href="http://github.com/audreyr/cookiecutter/">cookiecutter</a> package by <a href="http://github.com/audreyr/">Audrey Roy</a>.</p>
+      <p>Brome webserver was created by <a href="http://github.com/brome-hq/">Brome-HQ</a></p>
     </div>
 </div>
 {% endblock %}

brome/webserver/templates/public/home.html

@@ -6,7 +6,7 @@
 
   <h1>Welcome to the Brome webserver</h1>
 
-  <p><a href="" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
+  <p><a href="http://brome.readthedocs.org/en/" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
 </div><!-- /.jumbotron -->
 
 <div class="body-content">

requirements.txt

@@ -1,6 +1,5 @@
 wheel
 tornado
-castro
 netifaces
 selenium
 decorator