Commit eedc0547 authored by Calvin Metcalf's avatar Calvin Metcalf
Browse files

clean up tests

parent fef7b3ae

Gruntfile.js

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ module.exports = function(grunt) { 
				indent:2,

        //camelcase:true,

        globals: {

          define: true

          define: true,

          console:true

        }

			},

			all: [ './proj4/*.js','./proj4/projCode/*.js']

bower.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "proj4js",

  "version": "1.3.3",

  "version": "1.3.4",

  "homepage": "https://github.com/proj4js/proj4js",

  "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",

  "main": "dist/proj4.js",

package.json

+14 −6
Original line number Diff line number Diff line 
{

  "name": "proj4js",

  "version": "1.3.3",

  "version": "1.3.4",

  "description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",

  "main": "./dist/proj4.js",

  "directories": {
@@ -18,16 +18,24 @@ 
  "license": "MIT",

  "jam": {

    "main": "dist/amd/proj4.js",

    "include":["dist/amd/proj4.js","README.md","AUTHORS","LICENSE.md"]

    "include": [

      "dist/amd/proj4.js",

      "README.md",

      "AUTHORS",

      "LICENSE.md"

    ]

  },

  "devDependencies": {

    "grunt-cli": "~0.1.9",

    "grunt": "~0.4.1",

    "grunt-contrib-connect": "~0.3.0",

    "grunt-mocha-phantomjs": "~0.2.8",

    "grunt-contrib-jshint": "~0.6.0",

    "requirejs": "~2.1.7",

    "grunt-contrib-requirejs": "~0.4.1",

    "almond": "~0.2.5"

    "almond": "~0.2.5",

    "chai": "~1.7.2",

    "mocha": "~1.12.1",

    "curl": "https://github.com/cujojs/curl/tarball/0.8.1",

    "grunt-mocha-phantomjs": "~0.3.0"

  }

}

test/amd.html

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
<head>

  <meta charset="utf-8">

  <title>Mocha Tests</title>

  <link rel="stylesheet" href="lib/mocha.css" />

  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />

</head>

<body>

  <script src="lib/mocha.js"></script>

  <script src="../node_modules/mocha/mocha.js"></script>

  <div id="mocha"></div>

  <script src="testData.js"></script>

  <script data-main="test.amd.js" src="lib/require.js"></script>

  <script data-main="test.amd.js" src="../node_modules/requirejs/require.js"></script>

 

</body>

</html>
 
 No newline at end of file

test/index.html

+10 −8
Original line number Diff line number Diff line
@@ -2,21 +2,23 @@ 
<head>

  <meta charset="utf-8">

  <title>Mocha Tests</title>

  <link rel="stylesheet" href="lib/mocha.css" />

  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />

</head>

<body>

  <script src="lib/mocha.js"></script>

  <script src="../node_modules/mocha/mocha.js"></script>

  <div id="mocha"></div>

  <script src="testData.js"></script>

  <script>

    curl = {

      baseUrl: '../',

      paths:{

        lib:'../test/lib'

      baseUrl: '../'

    }

    }

  </script>

  <script src="lib/curl.js"></script>



  

 window.run = function(){

  if (window.mochaPhantomJS) { window.mochaPhantomJS.run(); }

      else { window.mocha.run(); }

 }  </script>

 <script src="../node_modules/curl/dist/curl/curl.js"></script>

 <script src='test.js'></script>

</body>

</html>