Merge branch 'issue-218' into 'master'

Selenium ✅

Documentation about how to set up test enviroment is on the way. Meanwhile here is the code.

Closes #218

Closes #385

----------------------
Update:
A little guide to setup selenium testing enviroment is finally done:
[Road to TestEnv from DevEnv](http://git.ik.bme.hu/circle/cloud/wikis/roadtotestenv)

See merge request !301

circle/circle/settings/selenium_test.py

+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+import os# noqa
+from .base import *  # noqa
+# flake8: noqa
+os.environ['REUSE_DB'] = "1"
+os.environ['DJANGO_TEST_DB_NAME'] = "circle"
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.' +
+        get_env_variable('DJANG_DB_TYPE', 'postgresql_psycopg2'),
+        'NAME':  get_env_variable('DJANGO_DB_NAME', 'circle'),
+        'TEST_NAME': get_env_variable('DJANGO_TEST_DB_NAME', 'circle'),
+        'USER':  get_env_variable('DJANGO_DB_USER', 'circle'),
+        'PASSWORD':  get_env_variable('DJANGO_DB_PASSWORD'),
+        'HOST': get_env_variable('DJANGO_DB_HOST', ''),
+        'PORT': get_env_variable('DJANGO_DB_PORT', ''),
+    }
+}
+SOUTH_TESTS_MIGRATE = False
+
+INSTALLED_APPS += (
+        'acl.tests',
+        'django_nose',
+        'django_jenkins',
+)
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+
+path_to_selenium_test = os.path.expanduser('~/circle/circle/dashboard/tests/selenium')
+NOSE_ARGS = ['--stop', '--with-doctest', '--with-selenium-driver', '--selenium-driver=firefox', '-w%s' % path_to_selenium_test]
+
+PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
+
+CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.dummy.DummyCache'
+        }
+}
+
+LOGGING['loggers']['djangosaml2'] = {'handlers': ['console'],
+                                     'level': 'CRITICAL'}
+
+level = environ.get('LOGLEVEL', 'CRITICAL')
+LOGGING['handlers']['console'] = {'level': level,
+                                  'class': 'logging.StreamHandler',
+                                  'formatter': 'simple'}
+for i in LOCAL_APPS:
+        LOGGING['loggers'][i] = {'handlers': ['console'], 'level': level}

circle/circle/settings/test.py

@@ -38,7 +38,7 @@ INSTALLED_APPS += (
     'django_nose',
     'django_nose',
 )
 )
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-NOSE_ARGS = ['--with-doctest']
+NOSE_ARGS = ['--with-doctest', '--exclude-dir=dashboard/tests/selenium']
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 
 
 CACHES = {
 CACHES = {

circle/dashboard/templates/dashboard/_client-check.html

@@ -22,7 +22,7 @@
         {% csrf_token %}
         {% csrf_token %}
         <a class="btn btn-default" href="{%  url "dashboard.views.detail" pk=instance.pk %}" data-dismiss="modal">{% trans "Cancel" %}</a>
         <a class="btn btn-default" href="{%  url "dashboard.views.detail" pk=instance.pk %}" data-dismiss="modal">{% trans "Cancel" %}</a>
         <a class="btn btn-info" href="{{ client_download_url }}" traget="_blank">{% trans "Download the Client" %}</a>
         <a class="btn btn-info" href="{{ client_download_url }}" traget="_blank">{% trans "Download the Client" %}</a>
-        <button data-dismiss="modal" id="client-check-button" type="submit" class="btn btn-success" title="{% trans "I downloaded and installed the client and I want to connect using it. This choice will be saved to your compuer" %}">
+        <button data-dismiss="modal" id="client-check-button" type="submit" class="btn btn-success modal-accept" title="{% trans "I downloaded and installed the client and I want to connect using it. This choice will be saved to your compuer" %}">
             <i class="fa fa-external-link"></i> {% trans "I have the Client installed" %}
             <i class="fa fa-external-link"></i> {% trans "I have the Client installed" %}
         </button>
         </button>
         <input id="connect-uri" name="connect-uri" type="hidden" value="{% if instance.get_connect_uri %}{{ instance.get_connect_uri}}{% endif %}" />
         <input id="connect-uri" name="connect-uri" type="hidden" value="{% if instance.get_connect_uri %}{{ instance.get_connect_uri}}{% endif %}" />

circle/dashboard/templates/dashboard/confirm/ajax-delete.html

@@ -18,7 +18,7 @@
             {% csrf_token %}
             {% csrf_token %}
             <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
             <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
             <input type="hidden" name="next" value="{{ request.GET.next }}"/>
             <input type="hidden" name="next" value="{{ request.GET.next }}"/>
-            <button class="btn btn-danger"
+            <button class="btn btn-danger modal-accept"
               {% if disable_submit %}disabled{% endif %}
               {% if disable_submit %}disabled{% endif %}
               >{% trans "Delete" %}</button>
               >{% trans "Delete" %}</button>
           </form>
           </form>

circle/dashboard/templates/dashboard/mass-operate.html

@@ -31,7 +31,7 @@ Do you want to perform the <strong>{{op}}</strong> operation on the following {{
   <div class="pull-right">
   <div class="pull-right">
     <a class="btn btn-default" href="{% url "dashboard.views.vm-list" %}"
     <a class="btn btn-default" href="{% url "dashboard.views.vm-list" %}"
      data-dismiss="modal">{% trans "Cancel" %}</a>
      data-dismiss="modal">{% trans "Cancel" %}</a>
-    <button class="btn btn-{{ opview.effect }}" type="submit" id="mass-op-form-send">
+    <button class="btn btn-{{ opview.effect }} modal-accept" type="submit" id="mass-op-form-send">
       {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ opview.name|capfirst }}
       {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ opview.name|capfirst }}
     </button>
     </button>
   </div>
   </div>

circle/dashboard/templates/dashboard/operate.html

@@ -19,7 +19,7 @@ Do you want to perform the following operation on
   <div class="pull-right">
   <div class="pull-right">
     <a class="btn btn-default" href="{{object.get_absolute_url}}"
     <a class="btn btn-default" href="{{object.get_absolute_url}}"
         data-dismiss="modal">{% trans "Cancel" %}</a>
         data-dismiss="modal">{% trans "Cancel" %}</a>
-    <button class="btn btn-{{ opview.effect }} btn-op-form-send" type="submit" id="op-form-send">
+    <button class="btn btn-{{ opview.effect }} btn-op-form-send modal-accept" type="submit" id="op-form-send">
       {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ op.name|capfirst }}
       {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ op.name|capfirst }}
     </button>
     </button>
   </div>
   </div>

circle/fabfile.py

@@ -135,6 +135,18 @@ def test(test=""):
         run("./manage.py test --settings=circle.settings.test %s" % test)
         run("./manage.py test --settings=circle.settings.test %s" % test)
 
 
 
 
+@roles('portal')
+def selenium(test=""):
+    "Run selenium tests"
+    with _workon("circle"), cd("~/circle/circle"):
+        if test == "f":
+            test = "--failed"
+        else:
+            test += " --with-id"
+        run("xvfb-run ./manage.py test "
+            "--settings=circle.settings.selenium_test %s" % test)
+
+
 def pull(dir="~/circle/circle"):
 def pull(dir="~/circle/circle"):
     "Pull from upstream branch (stash any changes)"
     "Pull from upstream branch (stash any changes)"
     now = unicode(datetime.datetime.now())
     now = unicode(datetime.datetime.now())

requirements/test.txt

@@ -3,5 +3,9 @@
 coverage==3.7.1
 coverage==3.7.1
 factory-boy==2.4.1
 factory-boy==2.4.1
 mock==1.0.1
 mock==1.0.1
-django-nose==1.2
+django-nose==1.3
 nose==1.3.4
 nose==1.3.4
+nose-exclude==0.2.0
+selenium==2.45.0
+selenose==1.3
+-e git+https://github.com/kmmbvnr/django-jenkins.git@019774dc2f668bc66b66f90f97eb8e14ae9566a4#egg=django_jenkins-dev