From d742121f5406f202f5c7e543cd8afcf8cc428a4f Mon Sep 17 00:00:00 2001 From: Maxime Vidori Date: Tue, 25 Nov 2014 10:55:36 +0100 Subject: [PATCH] Update Horizon to Jasmine 2.1.x Update of Jasmine to the newest version, update of angular as well to have support for it. Remove extra packages (xstatic) from settings files and improve jasmine error log in the console Implements: blueprint update-jasmine Change-Id: I884d0d0708130ff2ea825a3faf83ab929404dec6 --- .../templates/horizon/jasmine/jasmine.html | 53 +++---------------- openstack_dashboard/static_settings.py | 2 +- requirements.txt | 2 +- 3 files changed, 10 insertions(+), 47 deletions(-) diff --git a/horizon/templates/horizon/jasmine/jasmine.html b/horizon/templates/horizon/jasmine/jasmine.html index 00ed93081f..46bfbd9c33 100644 --- a/horizon/templates/horizon/jasmine/jasmine.html +++ b/horizon/templates/horizon/jasmine/jasmine.html @@ -1,20 +1,15 @@ - + Jasmine Spec Runner - - - - - - - - + + + + - + {% endfor %} - - + + - - - - - diff --git a/openstack_dashboard/static_settings.py b/openstack_dashboard/static_settings.py index 6bcf5a661a..aabe13df76 100644 --- a/openstack_dashboard/static_settings.py +++ b/openstack_dashboard/static_settings.py @@ -55,7 +55,7 @@ STATICFILES_DIRS = [ xstatic.main.XStatic(xstatic.pkg.hogan).base_dir), ('horizon/lib/font-awesome', xstatic.main.XStatic(xstatic.pkg.font_awesome).base_dir), - ('horizon/lib/jasmine-1.3.1', + ('horizon/lib/jasmine', xstatic.main.XStatic(xstatic.pkg.jasmine).base_dir), ('horizon/lib/jquery', xstatic.main.XStatic(xstatic.pkg.jquery).base_dir), diff --git a/requirements.txt b/requirements.txt index 09cc2f0f8d..1ed74e990f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -49,7 +49,7 @@ XStatic-Bootstrap-SCSS>=3 # Apache 2.0 License XStatic-D3>=3.1.6.2 # BSD License (3 clause) XStatic-Hogan>=2.0.0.2 # Apache 2.0 License XStatic-Font-Awesome>=4.2.0 # SIL OFL 1.1 License, MIT License -XStatic-Jasmine>=1.3.1.1 # MIT License +XStatic-Jasmine>=2.1.2.0 # MIT License XStatic-jQuery>=1.7.2 # MIT License XStatic-JQuery-Migrate>=1.2.1.1 # MIT License XStatic-JQuery.quicksearch>=2.0.3.1 # MIT License