openstack
/
horizon
Code Issues Proposed changes

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
This commit is contained in:
Maxime Vidori 2014-11-25 10:55:36 +01:00 committed by Matt Farina
parent 67dee8e968
commit d742121f54
3 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
horizon/templates/horizon/jasmine/jasmine.html
View File

@ -1,20 +1,15 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html>
<head>
<title>Jasmine Spec Runner</title>
<link rel="shortcut icon" type="image/png" href="">
<link rel="stylesheet" type="text/css" href="">
<link rel="shortcut icon" type="image/png" href="{{ STATIC_URL }}horizon/lib/jasmine-1.3.1/jasmine.css">
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}horizon/lib/jasmine-1.3.1/jasmine.css">
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/jasmine-1.3.1/jasmine.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/jasmine-1.3.1/jasmine-html.js"></script>
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}horizon/lib/jasmine/jasmine.css">
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/jasmine/jasmine.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/jasmine/jasmine-html.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/jasmine/boot.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/angular/angular.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/angular/angular-mock.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/angular/angular-mocks.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}horizon/lib/angular/angular-cookies.js"></script>
<script type='text/javascript' charset='utf-8'>
@ -30,44 +25,12 @@
<script type="application/javascript" src="{{ STATIC_URL }}{{ spec }}"></script>
{% endfor %}
</head>
<body>
<div id="main_content" class="hidden" style="visibility:hidden; height: 0">
{% block content %}
{% endblock %}
</div>
<script type="text/javascript">
(function() {
var jasmineEnv = jasmine.getEnv();
jasmineEnv.updateInterval = 1000;
var htmlReporter = new jasmine.HtmlReporter();
jasmineEnv.addReporter(htmlReporter);
jasmineEnv.specFilter = function(spec) {
return htmlReporter.specFilter(spec);
};
var currentWindowOnload = window.onload;
window.onload = function() {
if (currentWindowOnload) {
currentWindowOnload();
}
execJasmine();
};
function execJasmine() {
jasmineEnv.execute();
}
})();
</script>
</head>
<body>
</body>
</html>

2
openstack_dashboard/static_settings.py
View File

@ -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),

2
requirements.txt
View File

@ -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