' - 'This is a fake httpresponse from a fake view for testing ' - ' purposes only' - '
') - return resp diff --git a/horizon/views/__init__.py b/horizon/views/__init__.py index c70406d73..8868ee4a1 100644 --- a/horizon/views/__init__.py +++ b/horizon/views/__init__.py @@ -14,4 +14,4 @@ # License for the specific language governing permissions and limitations # under the License. -from .base import APIView, user_home +from .base import APIView, user_home, splash diff --git a/horizon/views/base.py b/horizon/views/base.py index 548fbf15b..2f48d5c2d 100644 --- a/horizon/views/base.py +++ b/horizon/views/base.py @@ -16,6 +16,9 @@ from django import shortcuts from django.views import generic +from django.views.decorators import vary + +from openstack_auth.views import Login import horizon from horizon import exceptions @@ -26,6 +29,22 @@ def user_home(request): return shortcuts.redirect(horizon.get_user_home(request.user)) +def get_user_home(user): + if user.is_superuser: + return horizon.get_dashboard('syspanel').get_absolute_url() + return horizon.get_dashboard('nova').get_absolute_url() + + +@vary.vary_on_cookie +def splash(request): + if request.user.is_authenticated(): + return shortcuts.redirect(get_user_home(request.user)) + form = Login(request) + request.session.clear() + request.session.set_test_cookie() + return shortcuts.render(request, 'splash.html', {'form': form}) + + class APIView(generic.TemplateView): """ A quick class-based view for putting API data into a template. diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py index 812d03f50..aceacb719 100644 --- a/openstack_dashboard/settings.py +++ b/openstack_dashboard/settings.py @@ -51,7 +51,7 @@ ROOT_URLCONF = 'openstack_dashboard.urls' HORIZON_CONFIG = { 'dashboards': ('nova', 'syspanel', 'settings',), 'default_dashboard': 'nova', - 'user_home': 'openstack_dashboard.views.user_home', + 'user_home': 'horizon.views.user_home', 'ajax_queue_limit': 10 } diff --git a/openstack_dashboard/static/dashboard/less/horizon.less b/openstack_dashboard/static/dashboard/less/horizon.less index 08b1ff75e..32a42577c 100644 --- a/openstack_dashboard/static/dashboard/less/horizon.less +++ b/openstack_dashboard/static/dashboard/less/horizon.less @@ -1,4 +1,4 @@ -@import "../../bootstrap/less/bootstrap.less"; +@import "../../../../horizon/static/bootstrap/less/bootstrap.less"; /* new clearfix */ .clearfix:after { diff --git a/openstack_dashboard/tests.py b/openstack_dashboard/tests.py deleted file mode 100644 index 8d941ce3e..000000000 --- a/openstack_dashboard/tests.py +++ /dev/null @@ -1,33 +0,0 @@ -import os - -from django import test -from django.utils import unittest - -from selenium.webdriver.firefox.webdriver import WebDriver - - -@unittest.skipUnless(os.environ.get('WITH_SELENIUM', False), - "The WITH_SELENIUM env variable is not set.") -class SeleniumTests(test.LiveServerTestCase): - @classmethod - def setUpClass(cls): - if os.environ.get('WITH_SELENIUM', False): - cls.selenium = WebDriver() - super(SeleniumTests, cls).setUpClass() - - @classmethod - def tearDownClass(cls): - super(SeleniumTests, cls).tearDownClass() - if os.environ.get('WITH_SELENIUM', False): - cls.selenium.quit() - - def test_splash(self): - self.selenium.get(self.live_server_url) - button = self.selenium.find_element_by_tag_name("button") - self.assertEqual(button.text, "Sign In") - - def test_qunit(self): - self.selenium.get("%s%s" % (self.live_server_url, "/qunit/")), - self.selenium.implicitly_wait("1000") - failed = self.selenium.find_element_by_class_name("failed") - self.assertEqual(int(failed.text), 0) diff --git a/openstack_dashboard/urls.py b/openstack_dashboard/urls.py index 76179b987..6d1a55e41 100644 --- a/openstack_dashboard/urls.py +++ b/openstack_dashboard/urls.py @@ -31,7 +31,7 @@ import horizon urlpatterns = patterns('', - url(r'^$', 'openstack_dashboard.views.splash', name='splash'), + url(r'^$', 'horizon.views.splash', name='splash'), url(r'^auth/', include('openstack_auth.urls')), url(r'', include(horizon.urls))) diff --git a/openstack_dashboard/views.py b/openstack_dashboard/views.py deleted file mode 100644 index 4dea550d6..000000000 --- a/openstack_dashboard/views.py +++ /dev/null @@ -1,44 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2012 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2012 Nebula, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -Views for home page. -""" -from django import shortcuts -from django.views.decorators import vary - -import horizon -from openstack_auth.views import Login - - -def user_home(user): - if user.is_superuser: - return horizon.get_dashboard('syspanel').get_absolute_url() - return horizon.get_dashboard('nova').get_absolute_url() - - -@vary.vary_on_cookie -def splash(request): - if request.user.is_authenticated(): - return shortcuts.redirect(user_home(request.user)) - form = Login(request) - request.session.clear() - request.session.set_test_cookie() - return shortcuts.render(request, 'splash.html', {'form': form}) diff --git a/run_tests.sh b/run_tests.sh index 751e73791..fb5b05a8d 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -259,6 +259,10 @@ function install_venv { function run_tests { sanity_check + if [ $selenium -eq 1 ]; then + export WITH_SELENIUM=1 + fi + echo "Running Horizon application tests" export NOSE_XUNIT_FILE=horizon/nosetests.xml ${command_wrapper} coverage erase @@ -267,9 +271,6 @@ function run_tests { HORIZON_RESULT=$? echo "Running openstack_dashboard tests" - if [ $selenium -eq 1 ]; then - export WITH_SELENIUM=1 - fi export NOSE_XUNIT_FILE=openstack_dashboard/nosetests.xml ${command_wrapper} coverage run -p $root/manage.py test openstack_dashboard --settings=openstack_dashboard.test.settings $testargs # get results of the openstack_dashboard tests