You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2014/08/04 16:38:09 UTC
[1/2] git commit: CLIMATE-492 - Drop boilerplate about controller and
test
Repository: climate
Updated Branches:
refs/heads/master 7284c424c -> 63fc51e55
CLIMATE-492 - Drop boilerplate about controller and test
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/806deba6
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/806deba6
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/806deba6
Branch: refs/heads/master
Commit: 806deba686586b31d3612e8a2d3056ba4dad8688
Parents: 7284c42
Author: Michael Joyce <jo...@apache.org>
Authored: Sun Aug 3 20:18:45 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Sun Aug 3 20:18:45 2014 -0700
----------------------------------------------------------------------
.../app/scripts/controllers/about.js | 36 -----------------
.../frontend-new/test/spec/controllers/about.js | 41 --------------------
2 files changed, 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/806deba6/ocw-ui/frontend-new/app/scripts/controllers/about.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/controllers/about.js b/ocw-ui/frontend-new/app/scripts/controllers/about.js
deleted file mode 100644
index 1971120..0000000
--- a/ocw-ui/frontend-new/app/scripts/controllers/about.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http: *www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-/**
- * @ngdoc function
- * @name ocwUiApp.controller:AboutCtrl
- * @description
- * # AboutCtrl
- * Controller of the ocwUiApp
- */
-angular.module('ocwUiApp')
- .controller('AboutCtrl', function ($scope) {
- $scope.awesomeThings = [
- 'HTML5 Boilerplate',
- 'AngularJS',
- 'Karma'
- ];
- });
http://git-wip-us.apache.org/repos/asf/climate/blob/806deba6/ocw-ui/frontend-new/test/spec/controllers/about.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/test/spec/controllers/about.js b/ocw-ui/frontend-new/test/spec/controllers/about.js
deleted file mode 100644
index a73f93a..0000000
--- a/ocw-ui/frontend-new/test/spec/controllers/about.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http: *www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-'use strict';
-
-describe('Controller: AboutCtrl', function () {
-
- // load the controller's module
- beforeEach(module('ocwUiApp'));
-
- var AboutCtrl,
- scope;
-
- // Initialize the controller and a mock scope
- beforeEach(inject(function ($controller, $rootScope) {
- scope = $rootScope.$new();
- AboutCtrl = $controller('AboutCtrl', {
- $scope: scope
- });
- }));
-
- it('should attach a list of awesomeThings to the scope', function () {
- expect(scope.awesomeThings.length).toBe(3);
- });
-});
[2/2] git commit: Drop boilerplate about controller and test
Posted by jo...@apache.org.
Drop boilerplate about controller and test
Merge PR #95
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/63fc51e5
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/63fc51e5
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/63fc51e5
Branch: refs/heads/master
Commit: 63fc51e556b8bca99f0d863ff559c92273a664c3
Parents: 7284c42 806deba
Author: Michael Joyce <jo...@apache.org>
Authored: Mon Aug 4 07:37:39 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Mon Aug 4 07:37:39 2014 -0700
----------------------------------------------------------------------
.../app/scripts/controllers/about.js | 36 -----------------
.../frontend-new/test/spec/controllers/about.js | 41 --------------------
2 files changed, 77 deletions(-)
----------------------------------------------------------------------