Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Commit 2eda9da

Browse files
dalelottsjoshkurz
authored andcommittedAug 12, 2013
Rename component.json to bower.json and changed ignored directories
Add .bowerrc file and set bower directory to bower_components Update project to use Karma (the new version of Testacular) Update travis.yml to install before running script, added support for 'npm test' to run grunt, incremented jQuery-UI dependency version to match the latest version of FullCalendar Update test.conf.js to use the correct path for jquery-ui scripts Update demo file to load separate jquery-ui scripts Update travis.yml - remove unnecessary npm install from, exclude gh-pages branch, use nodeJS 0.10, and add --verbose to grunt call.
1 parent 2da4dcb commit 2eda9da

9 files changed

+82
-55
lines changed
 

‎.bowerrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "bower_components"
3+
}

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
.idea
2+
coverage
13
node_modules/
2-
bower_components/
4+
bower_components/
5+
*.iml

‎.travis.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
language: node_js
22
node_js:
3-
- "0.8"
3+
- "0.10"
4+
5+
branches:
6+
except:
7+
- gh-pages
48

59
before_install:
6-
- export DISPLAY=:99.0
7-
- sh -e /etc/init.d/xvfb start
10+
- "export DISPLAY=:99.0"
11+
- "sh -e /etc/init.d/xvfb start"
12+
13+
before_script:
814
- npm install -g bower grunt-cli
9-
- npm install
1015
- bower install
1116

12-
script: "grunt"
17+
script: "grunt --verbose"

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ui-calendar directive [![Build Status](https://travis-ci.org/angular-ui/ui-calendar.png)](https://travis-ci.org/angular-ui/ui-calendar)
1+
# ui-calendar directive [![Build Status](https://travis-ci.org/dalelotts/ui-calendar.png?branch=master)](https://travis-ci.org/dalelotts/ui-calendar)
22

33
A complete AngularJS directive for the Arshaw FullCalendar.
44

‎component.json ‎bower.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
{
2-
"name": "angular-ui-calendar",
3-
"version": "0.1.3",
4-
"description": "A complete AngularJS directive for the Arshaw FullCalendar.",
5-
"author": "https://github.com/angular-ui/ui-calendar/graphs/contributors",
6-
"license": "MIT",
7-
"homepage": "http://angular-ui.github.com",
8-
"main": "./ui-calendar.js",
9-
"ignore": [
10-
"**/.*",
11-
"node_modules",
12-
"components",
13-
"test*",
14-
"demo*",
15-
"gruntFile.js",
16-
"package.json"
17-
],
18-
"dependencies": {
19-
"angular": "~1.x",
20-
"jquery": "~1.x",
21-
"jquery-ui": "1.9.2",
22-
"fullcalendar": "~1.x"
23-
},
24-
"devDependencies": {
25-
"angular-mocks": "~1.x",
26-
"bootstrap-css": "2.3.1"
27-
}
28-
}
1+
{
2+
"name": "angular-ui-calendar",
3+
"version": "0.1.3",
4+
"description": "A complete AngularJS directive for the Arshaw FullCalendar.",
5+
"author": "https://github.com/angular-ui/ui-calendar/graphs/contributors",
6+
"license": "MIT",
7+
"homepage": "http://angular-ui.github.com",
8+
"main": "./ui-calendar.js",
9+
"ignore": [
10+
"**/.*",
11+
"node_modules",
12+
"bower_components",
13+
"test*",
14+
"demo*",
15+
"gruntFile.js",
16+
"package.json"
17+
],
18+
"dependencies": {
19+
"angular": "~1.x",
20+
"jquery": "~1.x",
21+
"jquery-ui": "1.10.2",
22+
"fullcalendar": "~1.x"
23+
},
24+
"devDependencies": {
25+
"angular-mocks": "~1.x",
26+
"bootstrap-css": "2.3.1"
27+
}
28+
}

‎demo/index.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
<link rel="stylesheet" href="calendarDemo.css" />
99

1010
<script src="../bower_components/jquery/jquery.js"></script>
11-
<script src="../bower_components/jquery-ui/ui/jquery-ui.js"></script>
1211

12+
<script src="../bower_components/jquery-ui/ui/jquery.ui.core.js"></script>
13+
<script src="../bower_components/jquery-ui/ui/jquery.ui.widget.js"></script>
14+
<script src="../bower_components/jquery-ui/ui/jquery.ui.mouse.js"></script>
15+
<script src="../bower_components/jquery-ui/ui/jquery.ui.draggable.js"></script>
16+
<script src="../bower_components/jquery-ui/ui/jquery.ui.droppable.js"></script>
1317
<script src="../bower_components/angular/angular.js"></script>
1418
<script src="../bower_components/fullcalendar/fullcalendar.js"></script>
1519
<script src="../bower_components/fullcalendar/gcal.js"></script>

‎gruntFile.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
module.exports = function (grunt) {
2+
"use strict";
23

3-
grunt.loadNpmTasks('grunt-testacular');
4-
grunt.loadNpmTasks('grunt-contrib-jshint');
4+
// load all grunt tasks
5+
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
56

67
// Default task.
7-
grunt.registerTask('default', ['jshint', 'testacular']);
8+
grunt.registerTask('default', ['jshint', 'karma']);
89

9-
var testacularConfig = function(configFile, customOptions) {
10+
var testConfig = function(configFile, customOptions) {
1011
var options = { configFile: configFile, keepalive: true };
1112
var travisOptions = process.env.TRAVIS && { browsers: ['Firefox'], reporters: 'dots' };
1213
return grunt.util._.extend(options, customOptions, travisOptions);
1314
};
1415

1516
// Project configuration.
1617
grunt.initConfig({
17-
testacular: {
18+
karma: {
1819
unit: {
19-
options: testacularConfig('test/test.conf.js')
20+
options: testConfig('test/test.conf.js')
2021
}
2122
},
2223
jshint:{

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
"dependencies": {},
1010
"devDependencies": {
1111
"grunt": "~0.4.1",
12-
"grunt-testacular": "~0.3.0",
13-
"grunt-contrib-jshint": "~0.2.0"
12+
"grunt-karma": "~0.4.3",
13+
"grunt-contrib-jshint": "~0.2.0",
14+
"matchdep": "~0.1.1"
1415
},
15-
"scripts": {},
16+
"scripts": {"test": "grunt"},
1617
"repository": {
1718
"type": "git",
1819
"url": "git://github.com/angular-ui/ui-calendar.git"

‎test/test.conf.js

+20-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
basePath = '..';
22
files = [
3-
JASMINE,
4-
JASMINE_ADAPTER,
5-
'bower_components/jquery/jquery.js',
6-
'bower_components/jquery-ui/ui/jquery-ui.js',
7-
'bower_components/angular/angular.js',
8-
'bower_components/angular-mocks/angular-mocks.js',
9-
'bower_components/fullcalendar/fullcalendar.js',
10-
'src/calendar.js',
11-
'test/*.spec.js'
3+
JASMINE,
4+
JASMINE_ADAPTER,
5+
'bower_components/jquery/jquery.js',
6+
'bower_components/jquery-ui/ui/*.js',
7+
'bower_components/angular/angular.js',
8+
'bower_components/angular-mocks/angular-mocks.js',
9+
'bower_components/fullcalendar/fullcalendar.js',
10+
'src/calendar.js',
11+
'test/*.spec.js'
1212
];
13+
1314
singleRun = true;
14-
browsers = [];
15+
16+
browsers = ['Chrome'];
17+
18+
preprocessors = {
19+
'**/src/*.js': 'coverage'
20+
};
21+
22+
// test results reporter to use
23+
// possible values: 'dots', 'progress', 'junit'
24+
reporters = ['progress', 'coverage'];

0 commit comments

Comments
 (0)
This repository has been archived.