Dotclear


Ignore:
Timestamp:
09/04/13 21:55:21 (12 years ago)
Author:
Nicolas <nikrou77@…>
Branch:
default
Message:

[Tests] Add tests for media uploader
Refactoring of _media.js : put all code in a jquery plugin to make
it easy to test and to avoid polluting global namespace.
Use same jquery for tests and for admin

Need to add more tests for media uploader
Fix indentation for all js

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tests/functional/index.html

    r1703 r1724  
    77    <script type="text/javascript" src="lib/jasmine.js"></script> 
    88    <script type="text/javascript" src="lib/jasmine-html.js"></script> 
    9     <script type="text/javascript" src="lib/jquery.js"></script> 
     9    <!-- use same jquery --> 
     10    <script type="text/javascript" src="../../admin/js/jquery/jquery.js"></script> 
    1011    <script type="text/javascript" src="lib/jasmine-jquery.js"></script> 
    1112    <script type="text/javascript" src="lib/jasmine-jquery-bootstrap.js"></script> 
    … …  
    1314    <script type="text/javascript" src="../../admin/js/_users_actions.js"></script> 
    1415    <script type="text/javascript" src="../../admin/js/common.js"></script> 
     16 
    1517    <script type="text/javascript" src="js/fix_include.js"></script> 
    1618 
    17     <script type="text/javascript" src="spec/users_actions.js"></script> 
     19    <!-- jsUpload --> 
     20    <script type="text/javascript" src="../../admin/js/jsUpload/vendor/jquery.ui.widget.js"></script> 
     21    <script type="text/javascript" src="../../admin/js/jsUpload/tmpl.js"></script> 
     22    <script type="text/javascript" src="../../admin/js/jsUpload/template-upload.js"></script> 
     23    <script type="text/javascript" src="../../admin/js/jsUpload/template-download.js"></script> 
     24    <script type="text/javascript" src="../../admin/js/jsUpload/load-image.js"></script> 
     25    <script type="text/javascript" src="../../admin/js/jsUpload/jquery.iframe-transport.js"></script> 
     26    <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload.js"></script> 
     27    <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload-process.js"></script> 
     28    <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload-resize.js"></script>  
     29    <script type="text/javascript" src="../../admin/js/jsUpload/jquery.fileupload-ui.js"></script> 
     30    <script type="text/javascript" src="../../admin/js/_media.js"></script>     
     31 
     32    <!-- <script type="text/javascript" src="spec/users_actions.js"></script> --> 
    1833    <script type="text/javascript" src="spec/toggle_with_legend.js"></script> 
    19  
    2034    <script type="text/javascript" src="spec/common.js"></script> 
     35    <script type="text/javascript" src="spec/media_manager.js"></script> 
    2136  </head> 
    2237  <body> 
Note: See TracChangeset for help on using the changeset viewer.

Sites map