@@ -59,10 +61,12 @@
+ activityNo = activities.length - $index;
+ isInitial = activityNo == 1;">
diff --git a/frontend/app/ui_components/attachment-icon-directive.js b/frontend/app/ui_components/attachment-icon-directive.js
new file mode 100644
index 00000000000..36bb9359b25
--- /dev/null
+++ b/frontend/app/ui_components/attachment-icon-directive.js
@@ -0,0 +1,56 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+module.exports = function() {
+ var imageRegExp = new RegExp(/^image\/.*$/),
+ excelRegExp = new RegExp(/.*excel$/);
+ return {
+ restrict: 'E',
+ replace: true,
+ scope: {
+ type: '&'
+ },
+ template: '',
+ link: function(scope) {
+ var icon = 'ticket',
+ type = scope.type();
+
+ if (imageRegExp.test(type)) {
+ icon = 'image1';
+ }
+ if (excelRegExp.test(type)) {
+ icon = 'page-xls';
+ }
+ if (type === 'application/pdf') {
+ icon = 'page-pdf';
+ }
+
+ scope.icon = icon;
+ }
+ };
+};
diff --git a/frontend/app/ui_components/index.js b/frontend/app/ui_components/index.js
index 2f137742640..085a5b88fe5 100644
--- a/frontend/app/ui_components/index.js
+++ b/frontend/app/ui_components/index.js
@@ -104,5 +104,9 @@ angular.module('openproject.uiComponents')
.directive('userField', ['PathHelper', require('./user-field-directive')])
.directive('wikiToolbar', [require('./wiki-toolbar-directive')])
.directive('zoomSlider', ['I18n', require('./zoom-slider-directive')])
+ .directive('notifications', [require('./notifications-directive')])
+ .directive('notificationBox', ['I18n', require('./notification-box-directive')])
+ .directive('uploadProgress', [require('./upload-progress-directive')])
+ .directive('attachmentIcon', [require('./attachment-icon-directive')])
.filter('ancestorsExpanded', require('./filters/ancestors-expanded-filter'))
.filter('latestItems', require('./filters/latest-items-filter'));
diff --git a/frontend/app/ui_components/notification-box-directive.js b/frontend/app/ui_components/notification-box-directive.js
new file mode 100644
index 00000000000..53e616d4663
--- /dev/null
+++ b/frontend/app/ui_components/notification-box-directive.js
@@ -0,0 +1,74 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+module.exports = function(I18n) {
+
+ var notificationBoxController = function(scope) {
+ scope.uploadCount = 0;
+ scope.show = false;
+ scope.I18n = I18n;
+
+ scope.canBeHidden = function() {
+ return scope.content.uploads.length > 5;
+ };
+
+ scope.removable = function() {
+ return scope.content.type !== 'upload';
+ };
+
+ scope.typeable = function() {
+ return !!scope.content.type;
+ };
+
+ scope.remove = function() {
+ if (scope.removable()) {
+ scope.$emit('notification.remove', scope.content);
+ }
+ };
+
+ scope.$on('upload.error', function() {
+ if (scope.content.type === 'upload') {
+ scope.content.type = 'error';
+ }
+ });
+
+ scope.$on('upload.finished', function() {
+ scope.uploadCount += 1;
+ });
+ };
+
+ return {
+ restrict: 'E',
+ replace: true,
+ templateUrl: '/templates/components/notification-box.html',
+ scope: {
+ content: '='
+ },
+ link: notificationBoxController
+ };
+};
diff --git a/frontend/app/ui_components/notifications-directive.js b/frontend/app/ui_components/notifications-directive.js
new file mode 100644
index 00000000000..370c3905ee5
--- /dev/null
+++ b/frontend/app/ui_components/notifications-directive.js
@@ -0,0 +1,52 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+module.exports = function() {
+
+ var notificationsController = function(scope) {
+ scope.stack = [];
+
+ scope.$on('notification.add', function(_e, notification) {
+ scope.stack.push(notification);
+ });
+
+ scope.$on('notification.remove', function(_e, notification) {
+ _.remove(scope.stack, function(element) {
+ return element === notification;
+ });
+ });
+ };
+
+ return {
+ scope: true,
+ restrict: 'E',
+ replace: true,
+ templateUrl: '/templates/components/notifications.html',
+ link: notificationsController
+ };
+};
diff --git a/frontend/app/ui_components/upload-progress-directive.js b/frontend/app/ui_components/upload-progress-directive.js
new file mode 100644
index 00000000000..0e6718ece87
--- /dev/null
+++ b/frontend/app/ui_components/upload-progress-directive.js
@@ -0,0 +1,59 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+module.exports = function() {
+ 'use strict';
+ var uploadProgressController = function(scope) {
+
+ scope.upload.progress(function(details) {
+ scope.file = details.config.file.name;
+ if (details.lengthComputable) {
+ scope.value = Math.round(details.loaded / details.total * 100);
+ } else {
+ // dummy value if not computable
+ scope.value = 10;
+ }
+ }).success(function() {
+ scope.value = 100;
+ scope.completed = true;
+ scope.$emit('upload.finished');
+ }).error(function() {
+ scope.error = true;
+ scope.$emit('upload.error');
+ });
+ };
+
+ return {
+ scope: {
+ upload: '='
+ },
+ link: uploadProgressController,
+ replace: true,
+ templateUrl: '/templates/components/upload-progress.html'
+ };
+};
diff --git a/frontend/app/work_packages/controllers/details-tab-overview-controller.js b/frontend/app/work_packages/controllers/details-tab-overview-controller.js
index afd11440928..fe6f81607e8 100644
--- a/frontend/app/work_packages/controllers/details-tab-overview-controller.js
+++ b/frontend/app/work_packages/controllers/details-tab-overview-controller.js
@@ -31,7 +31,9 @@ module.exports = function(
WorkPackagesOverviewService,
WorkPackageFieldService,
EditableFieldsState,
- WorkPackageDisplayHelper
+ WorkPackageDisplayHelper,
+ NotificationsService,
+ I18n
) {
var vm = this;
@@ -77,5 +79,8 @@ module.exports = function(
return left.localeCompare(right);
});
});
+ $scope.$on('workPackageUpdatedInEditor', function() {
+ NotificationsService.addSuccess(I18n.t('js.label_successful_update'));
+ });
}
};
diff --git a/frontend/app/work_packages/controllers/index.js b/frontend/app/work_packages/controllers/index.js
index f1034b65043..8aa8221663a 100644
--- a/frontend/app/work_packages/controllers/index.js
+++ b/frontend/app/work_packages/controllers/index.js
@@ -41,6 +41,8 @@ angular.module('openproject.workPackages.controllers')
'WorkPackageFieldService',
'EditableFieldsState',
'WorkPackagesDisplayHelper',
+ 'NotificationsService',
+ 'I18n',
require('./details-tab-overview-controller')
])
.constant('ADD_WATCHER_SELECT_INDEX', -1)
diff --git a/frontend/app/work_packages/controllers/work-package-details-controller.js b/frontend/app/work_packages/controllers/work-package-details-controller.js
index 33788d337d3..b8a13789ca8 100644
--- a/frontend/app/work_packages/controllers/work-package-details-controller.js
+++ b/frontend/app/work_packages/controllers/work-package-details-controller.js
@@ -174,8 +174,7 @@ module.exports = function($scope,
function displayedActivities(workPackage) {
var activities = workPackage.embedded.activities;
- // remove first activity (assumes activities are sorted chronologically)
- activities.splice(0, 1);
+
if ($scope.activitiesSortedInDescendingOrder) {
activities.reverse();
}
diff --git a/frontend/app/work_packages/directives/index.js b/frontend/app/work_packages/directives/index.js
index 63584c6f3b3..fb83a6e7973 100644
--- a/frontend/app/work_packages/directives/index.js
+++ b/frontend/app/work_packages/directives/index.js
@@ -94,6 +94,14 @@ angular.module('openproject.workPackages.directives')
'featureFlags',
'PathHelper',
require('./work-packages-table-directive')
+ ])
+ .directive('workPackageAttachments', [
+ 'WorkPackageAttachmentsService',
+ 'NotificationsService',
+ 'I18n',
+ 'ConfigurationService',
+ 'ConversionService',
+ require('./work-package-attachments-directive')
]);
require('./inplace_editor');
diff --git a/frontend/app/work_packages/directives/inplace_editor/inplace-editor-edit-pane-directive.js b/frontend/app/work_packages/directives/inplace_editor/inplace-editor-edit-pane-directive.js
index c78b1c86e40..0f9ec3a5a2d 100644
--- a/frontend/app/work_packages/directives/inplace_editor/inplace-editor-edit-pane-directive.js
+++ b/frontend/app/work_packages/directives/inplace_editor/inplace-editor-edit-pane-directive.js
@@ -31,7 +31,8 @@ module.exports = function(
EditableFieldsState,
FocusHelper,
$timeout,
- ApiHelper) {
+ ApiHelper,
+ $rootScope) {
return {
transclude: true,
replace: true,
@@ -43,6 +44,11 @@ module.exports = function(
var vm = this;
var acknowledgedValidationErrors = ['required', 'number'];
+ // go full retard
+ var uploadPendingAttachments = function(wp) {
+ $rootScope.$broadcast('uploadPendingAttachments', wp);
+ };
+
this.submit = function(notify) {
var fieldController = $scope.fieldController;
var pendingFormChanges = getPendingFormChanges();
@@ -82,6 +88,7 @@ module.exports = function(
EditableFieldsState.errors = null;
}
);
+ uploadPendingAttachments(updatedWorkPackage);
})).catch(setFailure);
} else {
afterError();
diff --git a/frontend/app/work_packages/directives/work-package-attachments-directive.js b/frontend/app/work_packages/directives/work-package-attachments-directive.js
new file mode 100644
index 00000000000..ef002350b60
--- /dev/null
+++ b/frontend/app/work_packages/directives/work-package-attachments-directive.js
@@ -0,0 +1,128 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+module.exports = function(
+ workPackageAttachmentsService,
+ NotificationsService,
+ I18n,
+ ConfigurationService,
+ ConversionService
+) {
+ 'use strict';
+ var editMode = function(attrs) {
+ return typeof attrs.edit !== 'undefined';
+ };
+
+ var attachmentsController = function(scope, element, attrs) {
+ scope.files = [];
+
+ var workPackage = scope.workPackage(),
+ upload = function(event, workPackage) {
+ if (scope.files.length > 0) {
+ workPackageAttachmentsService.upload(workPackage, scope.files).then(function() {
+ scope.files = [];
+ loadAttachments();
+ });
+ }
+ },
+ loadAttachments = function() {
+ if (!editMode(attrs)) {
+ return;
+ }
+ scope.loading = true;
+ workPackageAttachmentsService.load(workPackage).then(function(attachments) {
+ scope.attachments = attachments;
+ }).finally(function() {
+ scope.loading = false;
+ });
+ };
+
+ scope.I18n = I18n;
+ scope.rejectedFiles = [];
+ scope.size = ConversionService.fileSize;
+
+ scope.instantUpload = function() {
+ scope.$emit('uploadPendingAttachments', workPackage);
+ };
+
+ var currentlyRemoving = [];
+ scope.remove = function(file) {
+ currentlyRemoving.push(file);
+ workPackageAttachmentsService.remove(file).then(function(file) {
+ _.remove(scope.attachments, file);
+ _.remove(scope.files, file);
+ }).finally(function() {
+ _.remove(currentlyRemoving, file);
+ });
+ };
+
+ scope.deleting = function(attachment) {
+ return _.findIndex(currentlyRemoving, attachment) > -1;
+ };
+
+ scope.$on('uploadPendingAttachments', upload);
+ scope.$watch('rejectedFiles', function(rejectedFiles) {
+ if (rejectedFiles.length === 0) {
+ return;
+ }
+ var errors = _.map(rejectedFiles, function(file) {
+ return file.name + ' (' + scope.size(file.size) + ')';
+ }),
+ message = I18n.t('js.label_rejected_files_reason',
+ { maximumFilesize: scope.size(scope.maximumFileSize) }
+ );
+ NotificationsService.addError(message, errors);
+ });
+
+ scope.fetchingConfiguration = true;
+ ConfigurationService.api().then(function(settings) {
+ scope.maximumFileSize = settings.maximumAttachmentFileSize;
+ // somehow, I18n cannot interpolate function results, so we need to cache this once
+ scope.maxFileSize = scope.size(settings.maximumAttachmentFileSize);
+ scope.fetchingConfiguration = false;
+ });
+
+ loadAttachments();
+ };
+
+ return {
+ restrict: 'E',
+ replace: true,
+ reqire: '^workPackageField',
+ scope: {
+ workPackage: '&'
+ },
+ templateUrl: function(element, attrs) {
+ if (editMode(attrs)) {
+ return '/templates/work_packages/attachments-edit.html';
+ }
+ return '/templates/work_packages/attachments.html';
+ },
+ link: attachmentsController
+ };
+};
diff --git a/frontend/app/work_packages/services/index.js b/frontend/app/work_packages/services/index.js
index 7308e10d16b..1663f14be3f 100644
--- a/frontend/app/work_packages/services/index.js
+++ b/frontend/app/work_packages/services/index.js
@@ -70,4 +70,14 @@ angular.module('openproject.workPackages.services')
])
.service('EditableFieldsState',
require('./editable-fields-state')
- );
+ )
+ .service('WorkPackageAttachmentsService', [
+ 'Upload', // 'Upload' is provided by ngFileUpload
+ 'PathHelper',
+ 'I18n',
+ 'NotificationsService',
+ '$q',
+ '$timeout',
+ '$http',
+ require('./work-package-attachments-service')
+ ]);
diff --git a/frontend/app/work_packages/services/work-package-attachments-service.js b/frontend/app/work_packages/services/work-package-attachments-service.js
new file mode 100644
index 00000000000..6201a677273
--- /dev/null
+++ b/frontend/app/work_packages/services/work-package-attachments-service.js
@@ -0,0 +1,97 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+//++
+
+module.exports = function(Upload, PathHelper, I18n, NotificationsService, $q, $timeout, $http) {
+
+ var upload = function(workPackage, files) {
+ var uploadPath = workPackage.links.addAttachment.url();
+ // for file in files build some promises, create a notification per WP,
+ // notify the noticiation (wat?) about progress
+ var uploads = _.map(files, function(file) {
+ var options = {
+ url: uploadPath,
+ fields: {
+ metadata: {
+ fileName: file.name,
+ description: file.description
+ }
+ },
+ file: file
+ };
+ return Upload.upload(options);
+ });
+
+ // notify the user
+ var message = I18n.t('js.label_upload_notification', {
+ id: workPackage.props.id,
+ subject: workPackage.props.subject
+ });
+
+ var notification = NotificationsService.addWorkPackageUpload(message, uploads);
+ var allUploadsDone = $q.defer();
+ $q.all(uploads).then(function() {
+ $timeout(function() { // let the notification linger for a bit
+ NotificationsService.remove(notification);
+ allUploadsDone.resolve();
+ }, 700);
+ }, function(err) {
+ allUploadsDone.reject(err);
+ });
+ return allUploadsDone.promise;
+ },
+ load = function(workPackage) {
+ var path = workPackage.links.attachments.url(),
+ attachments = $q.defer();
+ $http.get(path).success(function(response) {
+ attachments.resolve(response._embedded.elements);
+ }).error(function(err) {
+ attachments.reject(err);
+ });
+ return attachments.promise;
+ },
+ remove = function(fileOrAttachment) {
+ var removal = $q.defer();
+ if (angular.isObject(fileOrAttachment._links)) {
+ var path = fileOrAttachment._links.self.href;
+ $http.delete(path).success(function() {
+ removal.resolve(fileOrAttachment);
+ }).error(function(err) {
+ removal.reject(err);
+ });
+ } else {
+ removal.resolve(fileOrAttachment);
+ }
+ return removal.promise;
+ };
+
+ return {
+ upload: upload,
+ remove: remove,
+ load: load
+ };
+};
diff --git a/frontend/app/work_packages/tabs/user-activity-directive.js b/frontend/app/work_packages/tabs/user-activity-directive.js
index 953807bb9ae..6927f7faacb 100644
--- a/frontend/app/work_packages/tabs/user-activity-directive.js
+++ b/frontend/app/work_packages/tabs/user-activity-directive.js
@@ -45,6 +45,7 @@ module.exports = function($uiViewScroll,
workPackage: '=',
activity: '=',
activityNo: '=',
+ isInitial: '=',
inputElementId: '='
},
link: function(scope, element, attrs, exclusiveEditController) {
diff --git a/frontend/bower.json b/frontend/bower.json
index 4e8365ab731..ba0b3f0ba5a 100644
--- a/frontend/bower.json
+++ b/frontend/bower.json
@@ -27,7 +27,8 @@
"foundation-apps": "1.1.0",
"bourbon": "~4.2.1",
"ui-select": "0xf013/ui-select#c7bef79e24cbeab977635c7a94d8f9504d4ee2e2",
- "mousetrap": "~1.4.6"
+ "mousetrap": "~1.4.6",
+ "ng-file-upload": "~5.0.9"
},
"devDependencies": {
"mocha": "~1.14.0",
diff --git a/frontend/karma.conf.js b/frontend/karma.conf.js
index 4b9962d00ea..4c5c5bab613 100644
--- a/frontend/karma.conf.js
+++ b/frontend/karma.conf.js
@@ -84,9 +84,13 @@ module.exports = function(config) {
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
+ '/templates/**/*.html': ['ng-html2js'],
'../app/assets/javascripts/*.js': ['coverage'],
'app/**/*.js': ['webpack'] // coverage disabled
},
+ ngHtml2JsPreprocessor: {
+ module: 'openproject.templates'
+ },
// test results reporter to use
diff --git a/frontend/package.json b/frontend/package.json
index cb76f8af3c7..b417b0eb554 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -29,6 +29,7 @@
"karma-firefox-launcher": "~0.1.3",
"karma-junit-reporter": "~0.2.2",
"karma-mocha": "~0.1.3",
+ "karma-ng-html2js-preprocessor": "^0.1.2",
"karma-phantomjs-launcher": "~0.1.4",
"karma-webpack": "^1.5.0",
"mocha": "~1.18.2",
diff --git a/frontend/tests/integration/specs/work-packages/details-pane/details-pane-show-hide-accessibility-spec.js b/frontend/tests/integration/specs/work-packages/details-pane/details-pane-show-hide-accessibility-spec.js
index 08795ae8ae2..74039fc725c 100644
--- a/frontend/tests/integration/specs/work-packages/details-pane/details-pane-show-hide-accessibility-spec.js
+++ b/frontend/tests/integration/specs/work-packages/details-pane/details-pane-show-hide-accessibility-spec.js
@@ -38,12 +38,20 @@ describe('OpenProject', function () {
describe('...', function () {
beforeEach(function () {
$('.attributes-group.ng-scope:nth-child(1) .inplace-edit--read-value').click();
+ //element(by.css('.attributes-group.ng-scope:nth-child(1) textarea'));
+
+ // tab through all the elements in the inplace edit control
+ // Save
+ browser.actions().sendKeys(protractor.Key.TAB).perform();
+ // Save and send
+ browser.actions().sendKeys(protractor.Key.TAB).perform();
+ // Cancel
+ browser.actions().sendKeys(protractor.Key.TAB).perform();
});
+
it('show all / hide all should be accessible in one tab', function () {
- var editableTextarea = element(by.css('.attributes-group.ng-scope:nth-child(1) textarea'));
- editableTextarea.sendKeys(protractor.Key.ESCAPE);
- browser.actions().sendKeys(protractor.Key.TAB).perform();
browser.actions().sendKeys(protractor.Key.TAB).perform();
+
return expect(browser.driver.switchTo().activeElement().getText())
.to.eventually.equal('Show all');
});
diff --git a/frontend/tests/integration/specs/work-packages/details-pane/details-pane-spec.js b/frontend/tests/integration/specs/work-packages/details-pane/details-pane-spec.js
index af516ae60ad..e96aece7bf3 100644
--- a/frontend/tests/integration/specs/work-packages/details-pane/details-pane-spec.js
+++ b/frontend/tests/integration/specs/work-packages/details-pane/details-pane-spec.js
@@ -72,15 +72,15 @@ describe('OpenProject', function() {
it('should render the last 3 activites', function() {
expect(
$('ul li:nth-child(1) div.comments-number').getText()
- ).to.eventually.equal('#3');
+ ).to.eventually.equal('#4');
expect(
$('ul li:nth-child(2) div.comments-number').getText()
- ).to.eventually.equal('#2');
+ ).to.eventually.equal('#3');
expect(
$('ul li:nth-child(3) div.comments-number').getText()
- ).to.eventually.equal('#1');
+ ).to.eventually.equal('#2');
});
it('should contain the activities details', function() {
diff --git a/frontend/tests/integration/specs/work-packages/work-packages-spec.js b/frontend/tests/integration/specs/work-packages/work-packages-spec.js
index d641f444c9a..f7a23e90399 100644
--- a/frontend/tests/integration/specs/work-packages/work-packages-spec.js
+++ b/frontend/tests/integration/specs/work-packages/work-packages-spec.js
@@ -34,30 +34,25 @@ describe('OpenProject', function() {
beforeEach(function() {
page.get();
- browser.waitForAngular();
});
it('should show work packages title', function() {
- page.get();
-
expect(page.getSelectableTitle().getText()).to.eventually.equal('Work packages');
});
- it('should show work packages', function() {
- page.get();
+ it('should show the default column headers', function() {
+ var expected = ['', //note that there is hidden text
+ 'ID',
+ 'TYPE',
+ 'STATUS',
+ 'SUBJECT',
+ 'ASSIGNEE'];
- page.getTableHeaders().map(function(heading) {
- return heading.getText();
- }).then(function(headingTexts) {
- var expected = ['',
- 'ID',
- 'TYPE',
- 'STATUS',
- 'SUBJECT',
- 'ASSIGNEE'];
-
- for (var i = 0; i < expected.length; i++) {
- expect(headingTexts[i]).to.equal(expected[i]);
+ // the $$('a') should be unnecessary but it was added to prevent flickering
+ // runs caused by .hidden-for-sighted elements being visible when they shouldn't.
+ page.getTableHeaders().$$('a').then(function(headings) {
+ for (var i = 0; i < headings.length; i++) {
+ expect(headings[i].getText()).to.eventually.equal(expected[i]);
}
});
});
diff --git a/frontend/tests/unit/tests/directives/components/notification-box-directive-test.js b/frontend/tests/unit/tests/directives/components/notification-box-directive-test.js
new file mode 100644
index 00000000000..3d83ff641d8
--- /dev/null
+++ b/frontend/tests/unit/tests/directives/components/notification-box-directive-test.js
@@ -0,0 +1,63 @@
+//-- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+/* jshint expr: true */
+//++
+
+describe('NotificationBoxDirective', function() {
+ 'use strict';
+ var $compile, $rootScope;
+
+ beforeEach(module('openproject.uiComponents'));
+ beforeEach(module('openproject.templates')); // see karmaConfig
+
+ beforeEach(inject(function(_$compile_, _$rootScope_) {
+ $compile = _$compile_;
+ $rootScope = _$rootScope_;
+ }));
+
+ it('should need a content to properly work', function() {
+ expect(function() {
+ $compile('
');
+ });
+
+ context('w/ notifications present', function() {
+ var notification = { message: 'message' };
+
+ it('should be able to receive notification via $broadcast', function() {
+ var element = $compile('',
+ committed_on: DateTime.now,
+ )
+ }
+
+ let(:commit_message) { 'Some commit message' }
+
+ context 'generation' do
+ subject(:generated) { representer.to_json }
+
+ it { is_expected.to be_json_eql('Revision'.to_json).at_path('_type') }
+
+ describe 'revision' do
+ it { is_expected.to have_json_path('id') }
+
+ it_behaves_like 'API V3 formattable', 'message' do
+ let(:format) { 'plain' }
+ let(:raw) { revision.comments }
+ let(:html) { '')
+ expect(lastrev.time).to eq('2009-06-24 07:27:38 +0200')
+
+ # Even though that commit has a message, lastrev doesn't parse that deliberately
+ expect(lastrev.message).to eq('')
+ expect(lastrev.branch).to be_nil
+ expect(lastrev.paths).to be_nil
+ end
+
+ it 'references the last revision of the given path and identifier' do
+ lastrev = adapter.lastrev('README', '4f26664364207fa8b1af9f8722647ab2d4ac5d43')
+ expect(lastrev.scmid).to eq('4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8')
+ expect(lastrev.identifier).to eq('4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8')
+ expect(lastrev.author).to eq('Adam Soltys ')
+ expect(lastrev.time).to eq('2009-06-24 05:27:38')
+ end
+
+ it 'works with spaces in filename' do
+ lastrev = adapter.lastrev('filemane with spaces.txt',
+ 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
+ expect(lastrev.identifier).to eq('ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
+ expect(lastrev.scmid).to eq('ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
+ expect(lastrev.time).to eq('2010-09-18 19:59:46')
+ end
+
+ it 'encodes strings correctly' do
+ lastrev = adapter.lastrev('filemane with spaces.txt',
+ 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
+ expect(lastrev.author).to eq('Felix Schäfer ')
+ expect(lastrev.author).to eq("#{felix_hex} ")
+ end
+ end
+
+ describe '.revisions' do
+ it 'should retrieve all revisions' do
+ rev = adapter.revisions('', nil, nil, all: true)
+ expect(rev.length).to eq(22)
+ end
+
+ it 'should retrieve the latest revision' do
+ rev = adapter.revisions('', nil, nil, all: true)
+ expect(rev.latest.identifier).to eq('71e5c1d3dca6304805b143b9d0e6695fb3895ea4')
+ expect(rev.latest.format_identifier).to eq('71e5c1d3')
+ end
+
+ it 'should retrieve a certain revisions' do
+ rev = adapter.revisions('', '899a15d^', '899a15d')
+ expect(rev.length).to eq(1)
+ expect(rev[0].identifier).to eq('899a15dba03a3b350b89c3f537e4bbe02a03cdc9')
+ expect(rev[0].author).to eq('jsmith ')
+ end
+
+ it 'should retrieve revisions in reverse' do
+ rev = adapter.revisions('', nil, nil, all: true, reverse: true)
+ expect(rev.length).to eq(22)
+ expect(rev[0].identifier).to eq('7234cb2750b63f47bff735edc50a1c0a433c2518')
+ expect(rev[20].identifier).to eq('1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127')
+ end
+
+ it 'should retrieve revisions in a specific time frame' do
+ since = Time.gm(2010, 9, 30, 0, 0, 0)
+ rev = adapter.revisions('', nil, nil, all: true, since: since)
+ expect(rev.length).to eq(7)
+ expect(rev[0].identifier).to eq('71e5c1d3dca6304805b143b9d0e6695fb3895ea4')
+ expect(rev[1].identifier).to eq('1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127')
+ expect(rev[5].identifier).to eq('9a6f3b947d16f11b537363a60904d1b1d3bfcd2f')
+ expect(rev[6].identifier).to eq('67e7792ce20ccae2e4bb73eed09bb397819c8834')
+ end
+
+ it 'should retrieve revisions in a specific time frame in reverse' do
+ since = Time.gm(2010, 9, 30, 0, 0, 0)
+ rev = adapter.revisions('', nil, nil, all: true, since: since, reverse: true)
+ expect(rev.length).to eq(7)
+ expect(rev[0].identifier).to eq('67e7792ce20ccae2e4bb73eed09bb397819c8834')
+ expect(rev[5].identifier).to eq('1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127')
+ expect(rev[6].identifier).to eq('71e5c1d3dca6304805b143b9d0e6695fb3895ea4')
+ end
+
+ it 'should retrieve revisions by filename' do
+ rev = adapter.revisions('filemane with spaces.txt', nil, nil, all: true)
+ expect(rev.length).to eq(1)
+ expect(rev[0].identifier).to eq('ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
+ end
+
+ it 'should retrieve revisions with arbitrary whitespace' do
+ file = ' filename with a leading space.txt '
+ rev = adapter.revisions(file, nil, nil, all: true)
+ expect(rev.length).to eq(1)
+ expect(rev[0].paths[0][:path]).to eq(file)
+ end
+
+ it 'should show all paths of a revision' do
+ rev = adapter.revisions('', '899a15d^', '899a15d')[0]
+ expect(rev.paths.length).to eq(3)
+ expect(rev.paths[0]).to eq(action: 'M', path: 'README')
+ expect(rev.paths[1]).to eq(action: 'A', path: 'images/edit.png')
+ expect(rev.paths[2]).to eq(action: 'A', path: 'sources/welcome_controller.rb')
+ end
+ end
+
+ describe '.entries' do
+ shared_examples 'retrieve entries' do
+ it 'should retrieve entries from an identifier' do
+ entries = adapter.entries('', '83ca5fd')
+ expect(entries.length).to eq(9)
+
+ expect(entries[0].name).to eq('images')
+ expect(entries[0].kind).to eq('dir')
+ expect(entries[0].size).to be_nil
+ expect(entries[0]).to be_dir
+ expect(entries[0]).not_to be_file
+
+ expect(entries[3]).to be_file
+ expect(entries[3].size).to eq(56)
+ expect(entries[3].name).to eq(' filename with a leading space.txt ')
+ end
+
+ it 'should have a related revision' do
+ entries = adapter.entries('', '83ca5fd')
+ rev = entries[0].lastrev
+ expect(rev.identifier).to eq('deff712f05a90d96edbd70facc47d944be5897e3')
+ expect(rev.author).to eq('Adam Soltys ')
+
+ rev = entries[3].lastrev
+ expect(rev.identifier).to eq('83ca5fd546063a3c7dc2e568ba3355661a9e2b2c')
+ expect(rev.author).to eq('Felix Schäfer ')
+ end
+
+ it 'can be retrieved by tag' do
+ entries = adapter.entries(nil, 'tag01.annotated')
+ expect(entries.length).to eq(3)
+
+ sources = entries[1]
+ expect(sources.name).to eq('sources')
+ expect(sources.path).to eq('sources')
+ expect(sources).to be_dir
+
+ readme = entries[2]
+ expect(readme.name).to eq('README')
+ expect(readme.path).to eq('README')
+ expect(readme).to be_file
+ expect(readme.size).to eq(27)
+ expect(readme.lastrev.identifier).to eq('899a15dba03a3b350b89c3f537e4bbe02a03cdc9')
+ expect(readme.lastrev.time).to eq(Time.gm(2007, 12, 14, 9, 24, 1))
+ end
+
+ it 'can be retrieved by branch' do
+ entries = adapter.entries(nil, 'test_branch')
+ expect(entries.length).to eq(4)
+ sources = entries[1]
+ expect(sources.name).to eq('sources')
+ expect(sources.path).to eq('sources')
+ expect(sources).to be_dir
+
+ readme = entries[2]
+ expect(readme.name).to eq('README')
+ expect(readme.path).to eq('README')
+ expect(readme).to be_file
+ expect(readme.size).to eq(159)
+
+ expect(readme.lastrev.identifier).to eq('713f4944648826f558cf548222f813dabe7cbb04')
+ expect(readme.lastrev.time).to eq(Time.gm(2009, 6, 19, 4, 37, 23))
+ end
+ end
+
+ describe 'encoding' do
+ let (:char1_hex) { "\xc3\x9c".force_encoding('UTF-8') }
+
+ context 'with default encoding' do
+ it_behaves_like 'retrieve entries'
+
+ it 'can retrieve directories containing entries encoded in latin-1' do
+ entries = adapter.entries('latin-1-dir', '64f1f3e8')
+ f1 = entries[1]
+
+ expect(f1.name).to eq("test-\xDC-2.txt")
+ expect(f1.path).to eq("latin-1-dir/test-\xDC-2.txt")
+ expect(f1).to be_file
+ end
+
+ it 'cannot retrieve files with latin-1 encoding in their path' do
+ entries = adapter.entries('latin-1-dir', '64f1f3e8')
+ latin1_path = entries[1].path
+
+ expect { adapter.entries(latin1_path, '1ca7f5ed') }
+ .to raise_error(OpenProject::Scm::Exceptions::CommandFailed)
+ end
+ end
+
+ context 'with latin-1 encoding' do
+ let (:encoding) { 'ISO-8859-1' }
+
+ it_behaves_like 'retrieve entries'
+
+ it 'can be retrieved with latin-1 encoding' do
+ entries = adapter.entries('latin-1-dir', '64f1f3e8')
+ expect(entries.length).to eq(3)
+ f1 = entries[1]
+
+ expect(f1.name).to eq("test-#{char1_hex}-2.txt")
+ expect(f1.path).to eq("latin-1-dir/test-#{char1_hex}-2.txt")
+ expect(f1).to be_file
+ end
+
+ it 'can be retrieved with latin-1 directories' do
+ entries = adapter.entries("latin-1-dir/test-#{char1_hex}-subdir",
+ '1ca7f5ed')
+ expect(entries.length).to eq(3)
+ f1 = entries[1]
+
+ expect(f1).to be_file
+ expect(f1.name).to eq("test-#{char1_hex}-2.txt")
+ expect(f1.path).to eq("latin-1-dir/test-#{char1_hex}-subdir/test-#{char1_hex}-2.txt")
+ end
+ end
+ end
+ end
+
+ describe '.annotate' do
+ it 'should annotate a regular file' do
+ annotate = adapter.annotate('sources/watchers_controller.rb')
+ expect(annotate).to be_kind_of(OpenProject::Scm::Adapters::Annotate)
+ expect(annotate.lines.length).to eq(41)
+ expect(annotate.lines[4].strip).to eq('# This program is free software; '\
+ 'you can redistribute it and/or')
+ expect(annotate.revisions[4].identifier).to eq('7234cb2750b63f47bff735edc50a1c0a433c2518')
+ expect(annotate.revisions[4].author).to eq('jsmith')
+ end
+
+ it 'should annotate moved file' do
+ annotate = adapter.annotate('renamed_test.txt')
+ expect(annotate.lines.length).to eq(2)
+ expect(annotate.content).to eq("This is a test\nLet's pretend I'm adding a new feature!")
+ expect(annotate.lines).to match_array(['This is a test',
+ "Let's pretend I'm adding a new feature!"])
+
+ expect(annotate.revisions.length).to eq(2)
+ expect(annotate.revisions[0].identifier).to eq('fba357b886984ee71185ad2065e65fc0417d9b92')
+ expect(annotate.revisions[1].identifier).to eq('7e61ac704deecde634b51e59daa8110435dcb3da')
+ end
+
+ it 'should annotate with identifier' do
+ annotate = adapter.annotate('README', 'HEAD~10')
+ expect(annotate.lines.length).to eq(1)
+ expect(annotate.empty?).to be false
+ expect(annotate.content).to eq("Mercurial test repository\r")
+ expect(annotate.revisions.length).to eq(1)
+ expect(annotate.revisions[0].identifier).to eq('899a15dba03a3b350b89c3f537e4bbe02a03cdc9')
+ expect(annotate.revisions[0].author).to eq('jsmith')
+ end
+
+ it 'should raise for an invalid path' do
+ expect { adapter.annotate('does_not_exist.txt') }
+ .to raise_error(OpenProject::Scm::Exceptions::CommandFailed)
+
+ expect { adapter.annotate('/path/outside/repository') }
+ .to raise_error(OpenProject::Scm::Exceptions::CommandFailed)
+ end
+
+ it 'should return nil for binary path' do
+ expect(adapter.annotate('images/edit.png')).to be_nil
+ end
+
+ # We should rethink the output of annotated files for these formats.
+ it 'also returns nil for UTF-16 encoded file' do
+ expect(adapter.annotate('utf16.txt')).to be_nil
+ end
+ end
+
+ describe '.cat' do
+ it 'outputs the given file' do
+ out = adapter.cat('README')
+ expect(out).to include('Git test repository')
+ end
+
+ it 'raises an exception for an invalid file' do
+ expect { adapter.cat('doesnotexiss') }
+ .to raise_error(OpenProject::Scm::Exceptions::CommandFailed)
+ end
+ end
+
+ describe '.diff' do
+ it 'provides a full diff of the last commit by default' do
+ diff = adapter.diff('', 'HEAD')
+ expect(diff[0]).to eq('commit 71e5c1d3dca6304805b143b9d0e6695fb3895ea4')
+ expect(diff[1]).to eq("Author: Oliver G\xFCnther ")
+ end
+
+ it 'provides a negative diff' do
+ diff = adapter.diff('', 'HEAD~2', 'HEAD~1')
+ expect(diff.join("\n")).to include('-And this is a file')
+ end
+
+ it 'provides the complete for the given range' do
+ diff = adapter.diff('', '61b685f', '2f9c009')
+ expect(diff[1]).to eq('index 6cbd30c..b94e68e 100644')
+ expect(diff[10]).to eq('index 4eca635..9a541fe 100644')
+ end
+
+ it 'provides the selected diff for the given range' do
+ diff = adapter.diff('README', '61b685f', '2f9c009')
+ expect(diff).to eq(<<-DIFF.strip_heredoc.split("\n"))
+ diff --git a/README b/README
+ index 6cbd30c..b94e68e 100644
+ --- a/README
+ +++ b/README
+ @@ -1 +1,4 @@
+ Mercurial test repository
+ +
+ +Mercurial is a distributed version control system. Mercurial is dedicated to speed and efficiency with a sane user interface.
+ +It is written in Python.
+ DIFF
+ end
+ end
+ end
+ end
+end
diff --git a/spec/lib/open_project/scm/adapters/subversion_adapter_spec.rb b/spec/lib/open_project/scm/adapters/subversion_adapter_spec.rb
new file mode 100644
index 00000000000..c69025d5068
--- /dev/null
+++ b/spec/lib/open_project/scm/adapters/subversion_adapter_spec.rb
@@ -0,0 +1,405 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe OpenProject::Scm::Adapters::Subversion do
+ let(:root_url) { '/tmp/bar.svn' }
+ let(:url) { "file://#{root_url}" }
+ let(:config) { {} }
+ let(:adapter) { OpenProject::Scm::Adapters::Subversion.new url, root_url }
+
+ before do
+ allow(adapter.class).to receive(:config).and_return(config)
+ end
+
+ describe 'client information' do
+ it 'sets the Subversion client command' do
+ expect(adapter.client_command).to eq('svn')
+ end
+
+ context 'with client command from config' do
+ let(:config) { { client_command: '/usr/local/bin/svn' } }
+ it 'overrides the Subversion client command from config' do
+ expect(adapter.client_command).to eq('/usr/local/bin/svn')
+ end
+ end
+
+ shared_examples 'correct client version' do |svn_string, expected_version|
+ it 'should set the correct client version' do
+ expect(adapter)
+ .to receive(:scm_version_from_command_line)
+ .and_return(svn_string)
+
+ expect(adapter.client_version).to eq(expected_version)
+ expect(adapter.client_available).to be true
+ expect(adapter.client_version_string).to eq(expected_version.join('.'))
+ end
+ end
+
+ it_behaves_like 'correct client version', "svn, version 1.6.13 (r1002816)\n", [1, 6, 13]
+ it_behaves_like 'correct client version', "svn, versione 1.6.13 (r1002816)\n", [1, 6, 13]
+ it_behaves_like 'correct client version', "1.6.1\n1.7\n1.8", [1, 6, 1]
+ it_behaves_like 'correct client version', "1.6.2\r\n1.8.1\r\n1.9.1", [1, 6, 2]
+ end
+
+ describe 'invalid repository' do
+ describe '.check_availability!' do
+ it 'should not be available' do
+ expect(Dir.exists?(url)).to be false
+ expect(adapter).not_to be_available
+ expect { adapter.check_availability! }
+ .to raise_error(OpenProject::Scm::Exceptions::ScmUnavailable)
+ end
+
+ it 'should raise a meaningful error if shell output fails' do
+ error_string = <<-ERR.strip_heredoc
+ svn: E215004: Authentication failed and interactive prompting is disabled; see the --force-interactive option
+ svn: E215004: Unable to connect to a repository at URL 'file:///tmp/bar.svn'
+ svn: E215004: No more credentials or we tried too many times.
+ Authentication failed
+ ERR
+
+ allow(adapter).to receive(:popen3)
+ .and_yield(StringIO.new(''), StringIO.new(error_string))
+
+ expect { adapter.check_availability! }
+ .to raise_error(OpenProject::Scm::Exceptions::ScmUnauthorized)
+ end
+ end
+ end
+
+ describe 'repository with authorization' do
+ let(:adapter) { OpenProject::Scm::Adapters::Subversion.new url, root_url, login, password }
+ let(:login) { 'whatever@example.org' }
+ let(:svn_cmd) { adapter.send :build_svn_cmd, ['info'] }
+
+ context 'without password' do
+ let(:password) { nil }
+
+ it 'creates the subversion command' do
+ idx = svn_cmd.index('--username')
+ expect(idx).not_to be_nil
+ expect(svn_cmd[idx + 1]).to eq(login)
+ expect(svn_cmd).not_to include('--password')
+ end
+ end
+
+ context 'with password' do
+ let(:password) { 'VG%\';rm -rf /;},Y^m\+DuE,vJP/9' }
+
+ it 'creates the subversion command' do
+ idx = svn_cmd.index('--username')
+ expect(idx).not_to be_nil
+ expect(svn_cmd[idx + 1]).to eq(login)
+
+ idx = svn_cmd.index('--password')
+ expect(idx).not_to be_nil
+ expect(svn_cmd[idx + 1])
+ .to eq("VG\\%\\'\\;rm\\ -rf\\ /\\;\\},Y\\\\^m\\\\\\+DuE,vJP/9")
+ end
+ end
+ end
+
+ describe 'empty repository' do
+ include_context 'with tmpdir'
+ let(:root_url) { tmpdir }
+
+ describe '.create_empty_svn' do
+ context 'with valid root_url' do
+ it 'should create the repository' do
+ expect(Dir.exists?(root_url)).to be true
+ expect(Dir.entries(root_url).length).to eq 2
+ expect { adapter.create_empty_svn }.not_to raise_error
+
+ expect(Dir.exists?(root_url)).to be true
+ expect(Dir.entries(root_url).length).to be >= 5
+ end
+ end
+ context 'with non-existing root_url' do
+ let(:root_url) { File.join(tmpdir, 'foo', 'bar') }
+
+ it 'should fail' do
+ expect { adapter.create_empty_svn }
+ .to raise_error(OpenProject::Scm::Exceptions::CommandFailed)
+
+ expect(Dir.exists?(root_url)).to be false
+ end
+ end
+ end
+
+ describe '.check_availability!' do
+ it 'should be marked empty' do
+ adapter.create_empty_svn
+ expect { adapter.check_availability! }
+ .to raise_error(OpenProject::Scm::Exceptions::ScmEmpty)
+ end
+ end
+ end
+
+ describe 'local repository' do
+ with_subversion_repository do |repo_dir|
+ let(:root_url) { repo_dir }
+
+ it 'reads the Subversion version' do
+ expect(adapter.client_version.length).to be >= 3
+ end
+
+ it 'is a valid repository' do
+ expect(Dir.exists?(repo_dir)).to be true
+
+ out, process = Open3.capture2e('svn', 'info', url)
+ expect(process.exitstatus).to eq(0)
+ expect(out).to include('Repository UUID')
+ end
+
+ it 'should be available' do
+ expect(adapter).to be_available
+ expect { adapter.check_availability! }.to_not raise_error
+ end
+
+ describe '.info' do
+ it 'builds the info object' do
+ info = adapter.info
+ expect(info.root_url).to eq(url)
+ expect(info.lastrev.identifier).to eq('12')
+ expect(info.lastrev.author).to eq('oliver')
+ expect(info.lastrev.time).to eq('2015-07-08T13:32:29.228572Z')
+ end
+ end
+
+ describe '.entries' do
+ it 'reads all entries from the current revision' do
+ entries = adapter.entries
+ expect(entries.length).to eq(1)
+
+ expect(entries[0].name).to eq('subversion_test')
+ expect(entries[0].path).to eq('subversion_test')
+ end
+
+ it 'contains a reference to the last revision' do
+ entries = adapter.entries
+ expect(entries.length).to eq(1)
+ lastrev = entries[0].lastrev
+
+ expect(lastrev.identifier).to eq('12')
+ expect(lastrev.author).to eq('oliver')
+ expect(lastrev.message).to eq('')
+ expect(lastrev.time).to eq('2015-07-08T13:32:29.228572Z')
+ end
+
+ it 'reads all entries from the given revision' do
+ entries = adapter.entries(nil, 1)
+ expect(entries.length).to eq(1)
+ lastrev = entries[0].lastrev
+
+ expect(lastrev.identifier).to eq('1')
+ expect(lastrev.author).to eq('jp')
+ expect(lastrev.message).to eq('')
+ expect(lastrev.time).to eq('2007-09-10T16:54:38.484000Z')
+ end
+
+ it 'reads all entries from the given path' do
+ entries = adapter.entries('subversion_test')
+ expect(entries.length).to eq(5)
+
+ expect(entries[0].name).to eq('[folder_with_brackets]')
+ expect(entries[0].path).to eq('subversion_test/[folder_with_brackets]')
+ expect(entries[0]).to be_dir
+ expect(entries[0]).not_to be_file
+ expect(entries[0].size).to be_nil
+
+ expect(entries[1].name).to eq('folder')
+ expect(entries[1].path).to eq('subversion_test/folder')
+ expect(entries[1]).to be_dir
+ expect(entries[1]).not_to be_file
+ expect(entries[1].size).to be_nil
+
+ expect(entries[4].name).to eq('textfile.txt')
+ expect(entries[4].path).to eq('subversion_test/textfile.txt')
+ expect(entries[4]).to_not be_dir
+ expect(entries[4]).to be_file
+ expect(entries[4]).not_to be_dir
+ expect(entries[4].size).to eq(756)
+ end
+
+ it 'reads all entries from the given path and revision' do
+ entries = adapter.entries('subversion_test', '2')
+ expect(entries.length).to eq(4)
+ expect(entries[0].name).to eq('folder')
+ expect(entries[0].path).to eq('subversion_test/folder')
+
+ expect(entries[1].name).to eq('.project')
+ expect(entries[1].path).to eq('subversion_test/.project')
+
+ expect(entries[2].name).to eq('helloworld.rb')
+ expect(entries[2].path).to eq('subversion_test/helloworld.rb')
+
+ expect(entries[3].name).to eq('textfile.txt')
+ expect(entries[3].path).to eq('subversion_test/textfile.txt')
+ end
+ end
+
+ describe '.properties' do
+ it 'returns an empty hash for no properties' do
+ expect(adapter.properties('')).to eq({})
+ end
+
+ it 'returns the properties when available' do
+ expect(adapter.properties('subversion_test')).to eq('svn:ignore' => "foo\nbar/\n")
+ end
+
+ it 'does not return the properties from an older revision on the same path' do
+ expect(adapter.properties('subversion_test', 11)).to eq({})
+ end
+ end
+
+ describe '.revisions' do
+ it 'returns all revisions by default' do
+ revisions = adapter.revisions
+ expect(revisions.length).to eq(12)
+
+ expect(revisions[0].author).to eq('oliver')
+ expect(revisions[0].message).to eq("Propedit\n")
+
+ revisions.each_with_index do |rev, i|
+ expect(rev.identifier).to eq((12 - i).to_s)
+ end
+ end
+
+ it 'returns revisions for a specific path' do
+ revisions = adapter.revisions('subversion_test/[folder_with_brackets]', nil, nil,
+ with_paths: true)
+
+ expect(revisions.length).to eq(1)
+ expect(revisions[0].identifier).to eq('11')
+ expect(revisions[0].format_identifier).to eq('11')
+
+ paths = revisions[0].paths
+ expect(paths.length).to eq(2)
+ expect(paths[0]).to eq(action: 'A', path: '/subversion_test/[folder_with_brackets]',
+ from_path: nil, from_revision: nil)
+ end
+
+ it 'returns revision for a specific path and revision' do
+ # Folder was added in rev 2
+ expect { adapter.revisions('subversion_test/folder', 1) }
+ .to raise_error(OpenProject::Scm::Exceptions::CommandFailed)
+
+ revisions = adapter.revisions('subversion_test/folder', 2, nil,
+ with_paths: true)
+
+ expect(revisions.length).to eq(1)
+ expect(revisions[0].identifier).to eq('2')
+
+ paths = revisions[0].paths
+ expect(paths.length).to eq(7)
+ end
+
+ it 'returns revision for a specific range' do
+ revisions = adapter.revisions('subversion_test/folder', 2, 5,
+ with_paths: true)
+ expect(revisions.length).to eq(2)
+ expect(revisions[0].identifier).to eq('2')
+ expect(revisions[0].message).to eq('Initial import.')
+ expect(revisions[1].identifier).to eq('5')
+ expect(revisions[1].message).to eq('Modified one file in the folder.')
+
+ expect(revisions[0].paths.length).to eq(7)
+ expect(revisions[1].paths.length).to eq(1)
+ end
+ end
+
+ describe '.blame' do
+ it 'blames an existing file at the given path' do
+ annotate = adapter.annotate('subversion_test/[folder_with_brackets]/README.txt')
+ expect(annotate.lines.length).to eq(2)
+ expect(annotate.revisions.length).to eq(2)
+
+ expect(annotate.revisions[0].identifier).to eq('11')
+ expect(annotate.revisions[0].author).to eq('schmidt')
+ end
+
+ it 'outputs nothing for an invalid blame target' do
+ annotate = adapter.annotate('subversion_test/[folder_with_brackets]/README.txt', 10)
+ expect(annotate.lines.length).to eq(0)
+ expect(annotate.revisions.length).to eq(0)
+ end
+ end
+
+ describe '.cat' do
+ it 'outputs the given file' do
+ out = adapter.cat('subversion_test/[folder_with_brackets]/README.txt', 11)
+ expect(out).to eq('This file should be accessible for Redmine, '\
+ "although its folder contains square\nbrackets.\n")
+ end
+
+ it 'raises an exception for an invalid file' do
+ expect { adapter.cat('subversion_test/[folder_with_brackets]/README.txt', 10) }
+ .to raise_error(OpenProject::Scm::Exceptions::CommandFailed)
+ end
+ end
+
+ describe '.diff' do
+ it 'provides a full diff against the last revision' do
+ diff = adapter.diff('', 12)
+ expect(diff.join("\n")).to include('Added: svn:ignore')
+ end
+
+ it 'provides a negative diff' do
+ diff = adapter.diff('', 11, 12)
+ expect(diff.join("\n")).to include('Deleted: svn:ignore')
+ end
+
+ it 'provides the complete for the given range' do
+ diff = adapter.diff('', 8, 6).join("\n")
+ expect(diff).to include('Index: subversion_test/folder/greeter.rb')
+ expect(diff).to include('Index: subversion_test/helloworld.c')
+ end
+
+ it 'provides the selected diff for the given range' do
+ diff = adapter.diff('subversion_test/helloworld.c', 8, 6)
+ expect(diff).to eq(<<-DIFF.strip_heredoc.split("\n"))
+ Index: helloworld.c
+ ===================================================================
+ --- helloworld.c (revision 6)
+ +++ helloworld.c (revision 8)
+ @@ -3,6 +3,5 @@
+ int main(void)
+ {
+ printf("hello, world\\n");
+ -
+ return 0;
+ }
+ DIFF
+ end
+ end
+ end
+ end
+end
diff --git a/spec/workers/mail_notification_jobs/deliver_work_package_created_job_spec.rb b/spec/lib/open_project/scm/manager_spec.rb
similarity index 69%
rename from spec/workers/mail_notification_jobs/deliver_work_package_created_job_spec.rb
rename to spec/lib/open_project/scm/manager_spec.rb
index db89b0efe7c..4942623f6d5 100644
--- a/spec/workers/mail_notification_jobs/deliver_work_package_created_job_spec.rb
+++ b/spec/lib/open_project/scm/manager_spec.rb
@@ -28,21 +28,28 @@
#++
require 'spec_helper'
-require 'workers/mail_notification_jobs/shared_examples'
-describe DeliverWorkPackageCreatedJob, type: :model do
- let(:work_package) { FactoryGirl.create :work_package, subject: mail_subject }
- let(:job) { DeliverWorkPackageCreatedJob.new user.id, work_package.id, user.id }
+describe OpenProject::Scm::Manager do
+ let(:vendor) { 'TestScm' }
+ let(:scm_class) { Class.new }
- it_behaves_like 'a mail notification job' do
- context 'with work package not found' do
- let(:mail_subject) { 'no work package found! :o' }
+ before do
+ Repository.const_set(vendor, scm_class)
+ OpenProject::Scm::Manager.add vendor
+ end
- before do
- work_package.destroy
- end
+ after do
+ Repository.send(:remove_const, vendor)
+ OpenProject::Scm::Manager.delete vendor
+ end
- it_behaves_like 'job cannot find record'
+ it 'is a valid const' do
+ expect(OpenProject::Scm::Manager.registered[vendor]).to eq(Repository::TestScm)
+ end
+
+ context 'scm is not known' do
+ it 'is not included' do
+ expect(OpenProject::Scm::Manager.registered).to_not have_key('SomeOtherScm')
end
end
end
diff --git a/spec/lib/open_project/text_formatting_spec.rb b/spec/lib/open_project/text_formatting_spec.rb
index 4f5213c32d3..e6fd3e189ed 100644
--- a/spec/lib/open_project/text_formatting_spec.rb
+++ b/spec/lib/open_project/text_formatting_spec.rb
@@ -65,7 +65,7 @@ describe OpenProject::TextFormatting do
context 'Changeset links' do
let(:repository) do
- FactoryGirl.build_stubbed :repository,
+ FactoryGirl.build_stubbed :repository_subversion,
project: project
end
let(:changeset1) do
@@ -431,7 +431,7 @@ describe OpenProject::TextFormatting do
context 'Redmine links' do
let(:repository) do
- FactoryGirl.build_stubbed :repository, project: project
+ FactoryGirl.build_stubbed :repository_subversion, project: project
end
let(:source_url) do
{ controller: 'repositories',
diff --git a/spec/lib/redmine/i18n_spec.rb b/spec/lib/redmine/i18n_spec.rb
index c2132ec9b86..e729a86a9ca 100644
--- a/spec/lib/redmine/i18n_spec.rb
+++ b/spec/lib/redmine/i18n_spec.rb
@@ -130,21 +130,24 @@ module OpenProject
end
describe 'find_language' do
- it 'is nil if language is not active' do
+ before do
allow(Setting).to receive(:available_languages).and_return([:de])
+ end
+ it 'is nil if language is not active' do
expect(find_language(:en)).to be_nil
end
- it 'is the language if it is active' do
- allow(Setting).to receive(:available_languages).and_return([:de])
+ it 'is nil if no language is given' do
+ expect(find_language('')).to be_nil
+ expect(find_language(nil)).to be_nil
+ end
+ it 'is the language if it is active' do
expect(find_language(:de)).to eql :de
end
it 'can be found by uppercase if it is active' do
- allow(Setting).to receive(:available_languages).and_return([:de])
-
expect(find_language(:DE)).to eql :de
end
end
diff --git a/spec/lib/tabular_form_builder_spec.rb b/spec/lib/tabular_form_builder_spec.rb
index 7d61a1fb51c..13bb2c697fc 100644
--- a/spec/lib/tabular_form_builder_spec.rb
+++ b/spec/lib/tabular_form_builder_spec.rb
@@ -77,6 +77,10 @@ describe TabularFormBuilder do
it_behaves_like 'wrapped in field-container by default'
it_behaves_like 'wrapped in container', 'text-field-container'
+ before do
+ allow(Setting).to receive(:available_languages).and_return([:en])
+ end
+
it 'should output element' do
expect(output).to be_html_eql(%{
no special behaviour required
+
+ describe 'Journal 1' do
+ include_context 'updated until Journal 1'
+
+ it_behaves_like 'enqueues a regular notification'
+ end
+
+ describe 'Journal 2' do
+ include_context 'updated until Journal 2'
+
+ it_behaves_like 'enqueues a regular notification'
+ end
+
+ describe 'Journal 3' do
+ include_context 'updated until Journal 3'
+
+ it_behaves_like 'enqueues a regular notification'
+ end
+ end
+
+ context 'journal 3 created after timeout of 1, but inside of timeout for 2' do
+ describe 'Journal 3' do
+ include_context 'updated until Journal 3'
+
+ before do
+ journal_2.update_attribute(:created_at, journal_1.created_at + (timeout / 2))
+ journal_3.update_attribute(:created_at, journal_1.created_at + timeout + 5.seconds)
+ end
+
+ it 'immediately delivers a mail on behalf of Journal 1' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(
+ an_instance_of(DeliverWorkPackageNotificationJob))
+ call_listener
+ end
+
+ it 'also enqueues a regular mail' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(
+ an_instance_of(EnqueueWorkPackageNotificationJob),
+ run_at: anything)
+ call_listener
+ end
+ end
+ end
+
+ context 'journal 3 created after timeout of 1 and 2' do
+ # This is a normal case again, ensuring Journal 3 takes no responsiblity when not neccessary.
+
+ describe 'Journal 3' do
+ include_context 'updated until Journal 3'
+
+ before do
+ journal_2.update_attribute(:created_at, journal_1.created_at + (timeout / 2))
+ journal_3.update_attribute(:created_at, journal_2.created_at + timeout + 5.seconds)
+ end
+
+ it_behaves_like 'enqueues a regular notification'
+ end
+ end
+
+ context 'two subsequent changes after timeout of another journal' do
+ # This is a normal case again, because handling edge cases makes us miss on the normal cases
+
+ before do
+ work_package.journals.first.update_attribute(:created_at, (timeout + 5.seconds).ago)
+ work_package.reload
+
+ expect(work_package.update_by!(author, { done_ratio: 50 })).to be_truthy
+ work_package.reload
+ expect(work_package.update_by!(author, { done_ratio: 60 })).to be_truthy
+ work_package.reload
+ end
+
+ it_behaves_like 'enqueues a regular notification'
+ end
+ end
+end
+
+describe 'initialization' do
+ it 'subscribes the listener' do
+ expect(JournalNotificationMailer).to receive(:distinguish_journals)
+ FactoryGirl.create(:work_package)
+ end
+end
diff --git a/spec/models/news_spec.rb b/spec/models/news_spec.rb
index 772fad8aa93..3d793b09996 100644
--- a/spec/models/news_spec.rb
+++ b/spec/models/news_spec.rb
@@ -99,6 +99,8 @@ describe News, type: :model do
user = FactoryGirl.create(:user)
become_member_with_permissions(project, user)
+ # reload
+ project.members(true)
with_settings notified_events: ['news_added'] do
FactoryGirl.create(:news, project: project)
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 900b0f4cfa6..b298b92fee8 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -248,4 +248,59 @@ describe Project, type: :model do
it_behaves_like 'respecting group assignment settings'
end
end
+
+ describe 'countable required_project_storage' do
+ describe '#required_storage' do
+ it 'counts collections' do
+ expect(project).to receive(:count_for).with(:required_project_storage).and_call_original
+ storage_hash = project.required_storage
+ expect(storage_hash).to eq('attributes.attachments' => 0, total: 0)
+ end
+
+ it 'counts only once before caching' do
+ expect(project)
+ .to receive(:count_for).with(:required_project_storage)
+ .once
+ .and_return([{ 'whatever' => 123, total: 1234 }, 'my label'])
+
+ project.required_storage
+ project.required_storage
+ end
+ end
+
+ describe '#total_projects_size' do
+ let(:projects) { FactoryGirl.build_list(:project, 3) }
+ before do
+ projects.each(&:save!)
+ allow(Project).to receive(:all).and_return(projects)
+
+ allow(projects[0]).to receive(:count_for).and_return(
+ [{ 'attributes.attachments' => 23543, total: 23543 },
+ 'unused project label']
+ )
+ allow(projects[1]).to receive(:count_for).and_return(
+ [{ 'attributes.attachments' => 2, label_repository: 2412345, total: 2412347 },
+ 'unused project label']
+ )
+ Rails.cache.clear('projects/total_projects_size')
+ end
+
+ it 'counts required_storage on all projects' do
+ expect(Project.all.length).to eq(3)
+ expect(Project.total_projects_size).to eq(2435890)
+ end
+
+ it 'counts required_storage only once' do
+ expect(project).not_to receive(:count_for).with(:required_project_storage)
+ projects.each do |p|
+ expect(p).not_to receive(:count_for)
+ .with(:required_project_storage)
+ .once
+ .and_call_original
+ end
+ Project.total_projects_size
+ Project.total_projects_size
+ end
+ end
+ end
end
diff --git a/spec/models/repository/filesystem_spec.rb b/spec/models/repository/filesystem_spec.rb
deleted file mode 100644
index 9fca58f1f13..00000000000
--- a/spec/models/repository/filesystem_spec.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-describe Repository::Filesystem, type: :model do
- before do
- allow(Setting).to receive(:enabled_scm).and_return(['Filesystem'])
- end
-
- let(:instance) { described_class.new }
-
- def mock_dirs_exist(input, output)
- allow(Dir).to receive(:glob).with(input).and_return(output)
- allow(Dir).to receive(:exists?).with(input).and_return(true)
- end
-
- describe '.configured?' do
- subject { described_class.configured? }
-
- context 'configuration contains directories' do
- before do
- allow(OpenProject::Configuration)
- .to receive(:[])
- .with('scm_filesystem_path_whitelist')
- .and_return(['/dir'])
- end
-
- it 'is true' do
- is_expected.to be_truthy
- end
- end
-
- context 'configuration does not contain directories' do
- before do
- allow(OpenProject::Configuration)
- .to receive(:[])
- .with('scm_filesystem_path_whitelist')
- .and_return([])
- end
-
- it 'is false' do
- is_expected.to be_falsey
- end
- end
- end
-
- describe '#valid?' do
- let(:desired_url) { 'something' }
- let(:whitelisted_urls) { 'another_thing' }
-
- let(:valid_args) do
- { url: desired_url,
- path_encoding: 'US-ASCII' }
- end
- let(:expected_url_whitelist_error_message) do
- [I18n.t('activerecord.errors.models.repository.not_whitelisted')]
- end
- let(:expected_url_not_directory_error_message) do
- [I18n.t('activerecord.errors.models.repository.no_directory')]
- end
-
- before do
- mock_dirs_exist(desired_url, ['/this/will/match'])
- mock_dirs_exist(whitelisted_urls, ['/this/will/match'])
-
- allow(OpenProject::Configuration).to receive(:[])
- .with('scm_filesystem_path_whitelist')
- .and_return(whitelisted_urls)
-
- instance.attributes = valid_args
- end
-
- subject { instance }
-
- it 'is valid' do
- is_expected.to be_valid
- end
-
- context 'url not whitelisted' do
- before do
- mock_dirs_exist(desired_url, ['/desired/dir'])
- mock_dirs_exist(whitelisted_urls, ['/desired',
- '/desired/*',
- '/desired/di',
- '/desired/dir/1',
- '*'])
- end
-
- it 'is invalid' do
- instance.attributes = valid_args
-
- is_expected.to be_invalid
- expect(subject.errors[:url]).to eql(expected_url_whitelist_error_message)
- end
- end
-
- context 'url is not a directory' do
- before do
- allow(Dir).to receive(:exists?).with(desired_url).and_return(false)
- end
-
- it 'is invalid' do
- is_expected.to be_invalid
- expect(subject.errors[:url]).to eql(expected_url_not_directory_error_message)
- end
- end
-
- context 'url does not exist' do
- before do
- mock_dirs_exist(desired_url, [])
- end
-
- it 'is invalid' do
- is_expected.to be_invalid
- expect(subject.errors[:url]).to eql(expected_url_whitelist_error_message)
- end
- end
-
- context 'nothing is whitelisted' do
- before do
- mock_dirs_exist(whitelisted_urls, [])
- end
-
- it 'is invalid' do
- instance.attributes = valid_args
-
- is_expected.to be_invalid
- expect(subject.errors[:url]).to eql(expected_url_whitelist_error_message)
- end
- end
- end
-end
diff --git a/spec/models/repository/git_spec.rb b/spec/models/repository/git_spec.rb
new file mode 100644
index 00000000000..361e208400f
--- /dev/null
+++ b/spec/models/repository/git_spec.rb
@@ -0,0 +1,376 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe Repository::Git, type: :model do
+ let(:encoding) { 'UTF-8' }
+ let(:instance) { FactoryGirl.build(:repository_git, path_encoding: encoding) }
+ let(:adapter) { instance.scm }
+ let(:config) { {} }
+
+ before do
+ allow(Setting).to receive(:enabled_scm).and_return(['Git'])
+ allow(instance).to receive(:scm).and_return(adapter)
+ allow(adapter.class).to receive(:config).and_return(config)
+ end
+
+ describe 'available types' do
+ it 'allow local by default' do
+ expect(instance.class.available_types).to eq([:local])
+ end
+
+ context 'with disabled typed' do
+ let(:config) { { disabled_types: [:local, :managed] } }
+
+ it 'does not have any types' do
+ expect(instance.class.available_types).to be_empty
+ end
+ end
+ end
+
+ describe 'managed git' do
+ let(:managed_path) { '/tmp/managed_git' }
+ it 'is not manageable unless configured explicitly' do
+ expect(instance.manageable?).to be false
+ end
+
+ context 'with managed config' do
+ let(:config) { { manages: managed_path } }
+ let(:project) { FactoryGirl.build :project }
+ let(:identifier) { project.identifier + '.git' }
+
+ it 'is manageable' do
+ expect(instance.manageable?).to be true
+ expect(instance.class.available_types).to eq([:local, :managed])
+ end
+
+ context 'with disabled managed typed' do
+ let(:config) { { disabled_types: [:managed] } }
+
+ it 'is no longer manageable' do
+ expect(instance.class.available_types).to eq([:local])
+ expect(instance.manageable?).to be false
+ end
+ end
+
+ context 'and associated project' do
+ before do
+ instance.project = project
+ end
+
+ it 'outputs valid managed paths' do
+ expect(instance.repository_identifier).to eq(identifier)
+ path = File.join(managed_path, identifier)
+ expect(instance.managed_repository_path).to eq(path)
+ expect(instance.managed_repository_url).to eq(path)
+ end
+ end
+
+ context 'and associated project with parent' do
+ let(:parent) { FactoryGirl.build :project }
+ let(:project) { FactoryGirl.build :project, parent: parent }
+
+ before do
+ instance.project = project
+ end
+
+ it 'outputs the correct hierarchy path' do
+ expect(instance.managed_repository_path)
+ .to eq(File.join(managed_path, identifier))
+ end
+ end
+ end
+ end
+
+ describe 'with an actual repository' do
+ with_git_repository do |repo_dir|
+ let(:url) { repo_dir }
+ let(:instance) {
+ FactoryGirl.create(:repository_git,
+ path_encoding: encoding,
+ url: url,
+ root_url: url)
+ }
+
+ before do
+ instance.fetch_changesets
+ instance.reload
+ end
+
+ it 'should be available' do
+ expect(instance.scm).to be_available
+ end
+
+ it 'should fetch changesets from scratch' do
+ expect(instance.changesets.count).to eq(22)
+ expect(instance.changes.count).to eq(34)
+
+ commit = instance.changesets.reorder('committed_on ASC').first
+ expect(commit.comments).to eq("Initial import.\nThe repository contains 3 files.")
+ expect(commit.committer).to eq('jsmith ')
+ # assert_equal User.find_by_login('jsmith'), commit.user
+ # TODO: add a commit with commit time <> author time to the test repository
+ expect(commit.committed_on).to eq('2007-12-14 09:22:52')
+ expect(commit.commit_date).to eq('2007-12-14'.to_date)
+ expect(commit.revision).to eq('7234cb2750b63f47bff735edc50a1c0a433c2518')
+ expect(commit.scmid).to eq('7234cb2750b63f47bff735edc50a1c0a433c2518')
+ expect(commit.changes.count).to eq(3)
+
+ change = commit.changes.sort_by(&:path).first
+ expect(change.path).to eq('README')
+ expect(change.action).to eq('A')
+ end
+
+ it 'should fetch changesets incremental' do
+ # Remove the 3 latest changesets
+ instance.changesets.find(:all, order: 'committed_on DESC', limit: 8).each(&:destroy)
+ instance.reload
+ expect(instance.changesets.count).to eq(14)
+
+ rev_a_commit = instance.changesets.order('committed_on DESC').first
+ expect(rev_a_commit.revision).to eq('ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
+ expect(rev_a_commit.scmid).to eq('ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
+ # Mon Jul 5 22:34:26 2010 +0200
+ committed_on = Time.gm(2010, 9, 18, 19, 59, 46)
+ expect(rev_a_commit.committed_on).to eq(committed_on)
+ expect(instance.latest_changeset.committed_on).to eq(committed_on)
+
+ instance.fetch_changesets
+ expect(instance.changesets.count).to eq(22)
+ end
+
+ describe '.latest_changesets' do
+ it 'should fetch changesets with limits' do
+ changesets = instance.latest_changesets('', nil, 2)
+ expect(changesets.size).to eq(2)
+ end
+
+ it 'should fetch changesets with paths' do
+ changesets = instance.latest_changesets('images', nil)
+ expect(changesets.map(&:revision))
+ .to eq(['deff712f05a90d96edbd70facc47d944be5897e3',
+ '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+
+ changesets = instance.latest_changesets('README', nil)
+ expect(changesets.map(&:revision))
+ .to eq(['32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf',
+ '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8',
+ '713f4944648826f558cf548222f813dabe7cbb04',
+ '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
+ '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+ end
+
+ it 'should fetch changesets with path, revision and limit' do
+ changesets = instance.latest_changesets('images', '899a15dba')
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+
+ changesets = instance.latest_changesets('images', '899a15dba', 1)
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'])
+
+ changesets = instance.latest_changesets('README', '899a15dba')
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+
+ changesets = instance.latest_changesets('README', '899a15dba', 1)
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'])
+ end
+
+ it 'should fetch changesets with tag' do
+ changesets = instance.latest_changesets('images', 'tag01.annotated')
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+
+ changesets = instance.latest_changesets('README', '899a15dba', 1)
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'])
+
+ changesets = instance.latest_changesets('README', 'tag01.annotated')
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+
+ changesets = instance.latest_changesets('README', 'tag01.annotated', 1)
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'])
+ end
+
+ it 'should fetch changesets with path, branch, and limit' do
+ changesets = instance.latest_changesets('images', 'test_branch')
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+
+ changesets = instance.latest_changesets('images', 'test_branch', 1)
+ expect(changesets.map(&:revision))
+ .to eq(['899a15dba03a3b350b89c3f537e4bbe02a03cdc9'])
+
+ changesets = instance.latest_changesets('README', 'test_branch')
+ expect(changesets.map(&:revision))
+ .to eq(['713f4944648826f558cf548222f813dabe7cbb04',
+ '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
+ '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
+ '7234cb2750b63f47bff735edc50a1c0a433c2518'])
+
+ changesets = instance.latest_changesets('README', 'test_branch', 2)
+ expect(changesets.map(&:revision))
+ .to eq(['713f4944648826f558cf548222f813dabe7cbb04',
+ '61b685fbe55ab05b5ac68402d5720c1a6ac973d1'])
+ end
+ end
+
+ it 'should find changeset by name' do
+ ['7234cb2750b63f47bff735edc50a1c0a433c2518', '7234cb2750b'].each do |r|
+ expect(instance.find_changeset_by_name(r).revision)
+ .to eq('7234cb2750b63f47bff735edc50a1c0a433c2518')
+ end
+ end
+
+ it 'should find changeset by empty name' do
+ ['', ' ', nil].each do |r|
+ expect(instance.find_changeset_by_name(r)).to be_nil
+ end
+ end
+
+ it 'should assign scmid to identifier' do
+ c = instance.changesets.where(revision: '7234cb2750b63f47bff735edc50a1c0a433c2518').first
+ expect(c.scmid).to eq(c.identifier)
+ end
+
+ it 'should format identifier' do
+ c = instance.changesets.where(revision: '7234cb2750b63f47bff735edc50a1c0a433c2518').first
+ expect(c.format_identifier).to eq('7234cb27')
+ end
+
+ it 'should find previous changeset' do
+ %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
+ changeset = instance.find_changeset_by_name(r1)
+ %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
+ expect(instance.find_changeset_by_name(r2)).to eq(changeset.previous)
+ end
+ end
+ end
+
+ it 'should return nil when no previous changeset' do
+ %w|7234cb2750b63f47bff735edc50a1c0a433c2518 7234cb2|.each do |r1|
+ changeset = instance.find_changeset_by_name(r1)
+ expect(changeset.previous).to be_nil
+ end
+ end
+
+ it 'should find next changeset' do
+ %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
+ changeset = instance.find_changeset_by_name(r2)
+ %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
+ expect(instance.find_changeset_by_name(r1)).to eq(changeset.next)
+ end
+ end
+ end
+
+ it 'should next nil' do
+ %w|71e5c1d3dca6304805b143b9d0e6695fb3895ea4 71e5c1d3|.each do |r1|
+ changeset = instance.find_changeset_by_name(r1)
+ expect(changeset.next).to be_nil
+ end
+ end
+
+ context 'with an admin browsing activity' do
+ let(:user) { FactoryGirl.create(:admin) }
+ let(:project) { FactoryGirl.create(:project) }
+
+ def find_events(user, options = {})
+ fetcher = Redmine::Activity::Fetcher.new(user, options)
+ fetcher.scope = ['changesets']
+ fetcher.events(Date.today - 30, Date.today + 1)
+ end
+
+ it 'should activities' do
+ Changeset.create(repository: instance,
+ committed_on: Time.now,
+ revision: 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
+ scmid: 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
+ comments: 'test')
+
+ event = find_events(user).first
+ assert event.event_title.include?('abc7234c:')
+ assert event.event_path =~ /\?rev=abc7234cb2750b63f47bff735edc50a1c0a433c2$/
+ end
+ end
+
+ describe 'encoding' do
+ let(:felix_hex) { "Felix Sch\xC3\xA4fer" }
+
+ it 'should display UTF-8' do
+ c = instance.changesets.where(revision: 'ed5bb786bbda2dee66a2d50faf51429dbc043a7b').first
+ expect(c.committer).to eq("#{felix_hex} ")
+ expect(c.committer).to eq('Felix Schäfer ')
+ end
+
+ context 'with latin-1 encoding' do
+ let (:encoding) { 'ISO-8859-1' }
+ let (:char1_hex) { "\xc3\x9c".force_encoding('UTF-8') }
+
+ it 'should latest changesets latin 1 dir' do
+ instance.fetch_changesets
+ instance.reload
+ changesets = instance.latest_changesets(
+ "latin-1-dir/test-#{char1_hex}-subdir", '1ca7f5ed')
+ expect(changesets.map(&:revision))
+ .to eq(['1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127'])
+ end
+
+ it 'should browse changesets' do
+ changesets = instance.latest_changesets(
+ "latin-1-dir/test-#{char1_hex}-2.txt", '64f1f3e89')
+ expect(changesets.map(&:revision))
+ .to eq(['64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
+ '4fc55c43bf3d3dc2efb66145365ddc17639ce81e',
+ ])
+
+ changesets = instance.latest_changesets(
+ "latin-1-dir/test-#{char1_hex}-2.txt", '64f1f3e89', 1)
+ expect(changesets.map(&:revision))
+ .to eq(['64f1f3e89ad1cb57976ff0ad99a107012ba3481d'])
+ end
+ end
+ end
+
+ it_behaves_like 'is a countable repository' do
+ let(:repository) { instance }
+ end
+ end
+ end
+end
diff --git a/spec/models/repository/subversion_spec.rb b/spec/models/repository/subversion_spec.rb
new file mode 100644
index 00000000000..82de6da3fba
--- /dev/null
+++ b/spec/models/repository/subversion_spec.rb
@@ -0,0 +1,301 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe Repository::Subversion, type: :model do
+ let(:instance) { FactoryGirl.build(:repository_subversion) }
+ let(:adapter) { instance.scm }
+ let(:config) { {} }
+
+ before do
+ allow(Setting).to receive(:enabled_scm).and_return(['Subversion'])
+ allow(instance).to receive(:scm).and_return(adapter)
+ allow(instance.class).to receive(:scm_config).and_return(config)
+ end
+
+ describe 'default Subversion' do
+ it 'is not manageable' do
+ expect(instance.manageable?).to be false
+ end
+
+ it 'has one available type' do
+ expect(instance.class.available_types).to eq [:existing]
+ end
+
+ context 'with disabled typed' do
+ let(:config) { { disabled_types: [:existing, :managed] } }
+
+ it 'does not have any types' do
+ expect(instance.class.available_types).to be_empty
+ end
+ end
+ end
+
+ describe 'managed Subversion' do
+ let(:managed_path) { '/tmp/managed_svn' }
+ it 'is not manageable unless configured explicitly' do
+ expect(instance.manageable?).to be false
+ end
+
+ context 'with managed config' do
+ let(:config) { { manages: managed_path } }
+ let(:project) { FactoryGirl.build :project }
+
+ it 'is manageable' do
+ expect(instance.manageable?).to be true
+ expect(instance.class.available_types).to eq([:existing, :managed])
+ end
+
+ context 'with disabled managed typed' do
+ let(:config) { { disabled_types: [:managed] } }
+
+ it 'is no longer manageable' do
+ expect(instance.class.available_types).to eq([:existing])
+ expect(instance.manageable?).to be false
+ end
+ end
+
+ context 'and associated project' do
+ before do
+ instance.project = project
+ end
+
+ it 'outputs valid managed paths' do
+ path = File.join(managed_path, project.identifier)
+ expect(instance.managed_repository_path).to eq(path)
+ expect(instance.managed_repository_url).to eq("file://#{path}")
+ end
+ end
+
+ context 'and associated project with parent' do
+ let(:parent) { FactoryGirl.build :project }
+ let(:project) { FactoryGirl.build :project, parent: parent }
+
+ before do
+ instance.project = project
+ end
+
+ it 'outputs the correct hierarchy path' do
+ expect(instance.managed_repository_path)
+ .to eq(File.join(managed_path, project.identifier))
+ end
+ end
+ end
+ end
+
+ describe 'with a remote repository' do
+ let(:instance) {
+ FactoryGirl.build(:repository_subversion,
+ url: 'https://somewhere.example.org/svn/foo'
+ )
+ }
+
+ it_behaves_like 'is not a countable repository' do
+ let(:repository) { instance }
+ end
+ end
+
+ describe 'with an actual repository' do
+ with_subversion_repository do |repo_dir|
+ let(:url) { "file://#{repo_dir}" }
+ let(:instance) { FactoryGirl.create(:repository_subversion, url: url, root_url: url) }
+
+ it 'should be available' do
+ expect(instance.scm).to be_available
+ end
+
+ it 'should fetch changesets from scratch' do
+ instance.fetch_changesets
+ instance.reload
+
+ expect(instance.changesets.count).to eq(12)
+ expect(instance.changes.count).to eq(21)
+ expect(instance.changesets.find_by_revision('1').comments).to eq('Initial import.')
+ end
+
+ it 'should fetch changesets incremental' do
+ instance.fetch_changesets
+
+ # Remove changesets with revision > 5
+ instance.changesets.find(:all).each do |c| c.destroy if c.revision.to_i > 5 end
+ instance.reload
+ expect(instance.changesets.count).to eq(5)
+
+ instance.fetch_changesets
+ expect(instance.changesets.count).to eq(12)
+ end
+
+ it 'should latest changesets' do
+ instance.fetch_changesets
+
+ # with limit
+ changesets = instance.latest_changesets('', nil, 2)
+ assert_equal 2, changesets.size
+ assert_equal instance.latest_changesets('', nil).slice(0, 2), changesets
+
+ # with path
+ changesets = instance.latest_changesets('subversion_test/folder', nil)
+ expect(changesets.map(&:revision)).to eq %w[10 9 7 6 5 2]
+
+ # with path and revision
+ changesets = instance.latest_changesets('subversion_test/folder', 8)
+ expect(changesets.map(&:revision)).to eq %w[7 6 5 2]
+ end
+
+ it 'should directory listing with square brackets in path' do
+ instance.fetch_changesets
+ instance.reload
+
+ entries = instance.entries('subversion_test/[folder_with_brackets]')
+ expect(entries).to_not be_nil
+ expect(entries.size).to eq(1)
+ expect(entries.first.name).to eq('README.txt')
+ end
+
+ context 'with square brackets in base' do
+ let(:url) { "file://#{repo_dir}/subversion_test/[folder_with_brackets]" }
+
+ it 'should directory listing with square brackets in base' do
+ instance.fetch_changesets
+ instance.reload
+
+ expect(instance.changesets.count).to eq(1)
+ expect(instance.changes.count).to eq(2)
+
+ entries = instance.entries('')
+ expect(entries).to_not be_nil
+ expect(entries.size).to eq(1)
+ expect(entries.first.name).to eq('README.txt')
+ end
+ end
+
+ it 'should show the identifier' do
+ instance.fetch_changesets
+ instance.reload
+ c = instance.changesets.find_by_revision('1')
+ expect(c.revision).to eq(c.identifier)
+ end
+
+ it 'should find changeset by empty name' do
+ instance.fetch_changesets
+ instance.reload
+ ['', ' ', nil].each do |r|
+ expect(instance.find_changeset_by_name(r)).to be_nil
+ end
+ end
+
+ it 'should identifier nine digit' do
+ c = Changeset.new(repository: instance, committed_on: Time.now,
+ revision: '123456789', comments: 'test')
+ expect(c.identifier).to eq(c.revision)
+ end
+
+ it 'should format identifier' do
+ instance.fetch_changesets
+ instance.reload
+ c = instance.changesets.find_by_revision('1')
+ expect(c.format_identifier).to eq(c.revision)
+ end
+
+ it 'should format identifier nine digit' do
+ c = Changeset.new(repository: instance, committed_on: Time.now,
+ revision: '123456789', comments: 'test')
+ expect(c.format_identifier).to eq(c.revision)
+ end
+
+ it 'should log encoding ignore setting' do
+ with_settings commit_logs_encoding: 'windows-1252' do
+ s1 = "\xC2\x80"
+ s2 = "\xc3\x82\xc2\x80"
+ if s1.respond_to?(:force_encoding)
+ s1.force_encoding('ISO-8859-1')
+ s2.force_encoding('UTF-8')
+ assert_equal s1.encode('UTF-8'), s2
+ end
+ c = Changeset.new(repository: instance,
+ comments: s2,
+ revision: '123',
+ committed_on: Time.now)
+ expect(c.save).to be true
+ expect(c.comments).to eq(s2)
+ end
+ end
+
+ it 'should load previous and next changeset' do
+ instance.fetch_changesets
+ instance.reload
+ changeset2 = instance.find_changeset_by_name('2')
+ changeset3 = instance.find_changeset_by_name('3')
+ expect(changeset3.previous).to eq(changeset2)
+ expect(changeset2.next).to eq(changeset3)
+ end
+
+ it 'should return nil for no previous or next changeset' do
+ instance.fetch_changesets
+ instance.reload
+ changeset = instance.find_changeset_by_name('1')
+ expect(changeset.previous).to be_nil
+
+ changeset = instance.find_changeset_by_name('12')
+ expect(changeset.next).to be_nil
+ end
+
+ context 'with an admin browsing activity' do
+ let(:user) { FactoryGirl.create(:admin) }
+ let(:project) { FactoryGirl.create(:project) }
+
+ def find_events(user, options = {})
+ fetcher = Redmine::Activity::Fetcher.new(user, options)
+ fetcher.scope = ['changesets']
+ fetcher.events(Date.today - 30, Date.today + 1)
+ end
+
+ it 'should find events' do
+ Changeset.create(repository: instance, committed_on: Time.now,
+ revision: '1', comments: 'test')
+ event = find_events(user).first
+ expect(event.event_title).to include('1:')
+ expect(event.event_path).to match(/\?rev=1$/)
+ end
+
+ it 'should find events with larger numbers' do
+ Changeset.create(repository: instance, committed_on: Time.now,
+ revision: '123456789', comments: 'test')
+ event = find_events(user).first
+ expect(event.event_title).to include('123456789:')
+ expect(event.event_path).to match(/\?rev=123456789$/)
+ end
+ end
+
+ it_behaves_like 'is a countable repository' do
+ let(:repository) { instance }
+ end
+ end
+ end
+end
diff --git a/spec/models/user_deletion_spec.rb b/spec/models/user_deletion_spec.rb
index fb4c44f4573..8060ae14ffb 100644
--- a/spec/models/user_deletion_spec.rb
+++ b/spec/models/user_deletion_spec.rb
@@ -95,13 +95,13 @@ describe User, 'deletion', type: :model do
it { expect(associated_instance.journals.first.user).to eq(user2) }
it 'should update first journal changes' do
associations.each do |association|
- expect(associated_instance.journals.first.changed_data[association_key association].last).to eq(user2.id)
+ expect(associated_instance.journals.first.details[association_key association].last).to eq(user2.id)
end
end
it { expect(associated_instance.journals.last.user).to eq(substitute_user) }
it 'should update second journal changes' do
associations.each do |association|
- expect(associated_instance.journals.last.changed_data[association_key association].last).to eq(substitute_user.id)
+ expect(associated_instance.journals.last.details[association_key association].last).to eq(substitute_user.id)
end
end
end
@@ -157,14 +157,14 @@ describe User, 'deletion', type: :model do
it { expect(associated_instance.journals.first.user).to eq(substitute_user) }
it 'should update the first journal' do
associations.each do |association|
- expect(associated_instance.journals.first.changed_data[association_key association].last).to eq(substitute_user.id)
+ expect(associated_instance.journals.first.details[association_key association].last).to eq(substitute_user.id)
end
end
it { expect(associated_instance.journals.last.user).to eq(user2) }
it 'should update the last journal' do
associations.each do |association|
- expect(associated_instance.journals.last.changed_data[association_key association].first).to eq(substitute_user.id)
- expect(associated_instance.journals.last.changed_data[association_key association].last).to eq(user2.id)
+ expect(associated_instance.journals.last.details[association_key association].first).to eq(substitute_user.id)
+ expect(associated_instance.journals.last.details[association_key association].last).to eq(user2.id)
end
end
end
@@ -233,13 +233,13 @@ describe User, 'deletion', type: :model do
it { expect(associated_instance.journals.first.user).to eq(user2) }
it 'should update first journal changes' do
associations.each do |association|
- expect(associated_instance.journals.first.changed_data[association_key association].last).to eq(user2.id)
+ expect(associated_instance.journals.first.details[association_key association].last).to eq(user2.id)
end
end
it { expect(associated_instance.journals.last.user).to eq(substitute_user) }
it 'should update second journal changes' do
associations.each do |association|
- expect(associated_instance.journals.last.changed_data[association_key association].last).to eq(substitute_user.id)
+ expect(associated_instance.journals.last.details[association_key association].last).to eq(substitute_user.id)
end
end
end
@@ -397,7 +397,7 @@ describe User, 'deletion', type: :model do
end
describe 'WHEN the user has created a changeset' do
- with_created_filesystem_repository do
+ with_virtual_subversion_repository do
let(:associated_instance) do
FactoryGirl.build(:changeset,
repository_id: repository.id,
@@ -412,7 +412,7 @@ describe User, 'deletion', type: :model do
end
describe 'WHEN the user has updated a changeset' do
- with_created_filesystem_repository do
+ with_virtual_subversion_repository do
let(:associated_instance) do
FactoryGirl.build(:changeset,
repository_id: repository.id,
@@ -443,11 +443,11 @@ describe User, 'deletion', type: :model do
end
it { expect(associated_instance.journals.first.user).to eq(user2) }
it 'should update first journal changes' do
- expect(associated_instance.journals.first.changed_data[:user_id].last).to eq(user2.id)
+ expect(associated_instance.journals.first.details[:user_id].last).to eq(user2.id)
end
it { expect(associated_instance.journals.last.user).to eq(substitute_user) }
it 'should update second journal changes' do
- expect(associated_instance.journals.last.changed_data[:user_id].last).to eq(substitute_user.id)
+ expect(associated_instance.journals.last.details[:user_id].last).to eq(substitute_user.id)
end
end
diff --git a/spec/models/work_package/work_package_action_mailer_spec.rb b/spec/models/work_package/work_package_action_mailer_spec.rb
index 5e9f9d56f0f..4d0cad3c2e9 100644
--- a/spec/models/work_package/work_package_action_mailer_spec.rb
+++ b/spec/models/work_package/work_package_action_mailer_spec.rb
@@ -31,20 +31,23 @@ require 'spec_helper'
describe WorkPackage, type: :model do
describe ActionMailer::Base do
let(:user_1) {
- FactoryGirl.create(:user,
- mail: 'dlopper@somenet.foo')
+ FactoryGirl.build(:user,
+ mail: 'dlopper@somenet.foo',
+ member_in_project: project)
}
let(:user_2) {
- FactoryGirl.create(:user,
- mail: 'jsmith@somenet.foo')
+ FactoryGirl.build(:user,
+ mail: 'jsmith@somenet.foo',
+ member_in_project: project)
}
- let(:work_package) { FactoryGirl.build(:work_package) }
+ let(:project) { FactoryGirl.create(:project) }
+ let(:work_package) { FactoryGirl.build(:work_package, project: project) }
before do
ActionMailer::Base.deliveries.clear
- allow(work_package).to receive(:recipients).and_return([user_1.mail])
- allow(work_package).to receive(:watcher_recipients).and_return([user_2.mail])
+ allow(work_package).to receive(:recipients).and_return([user_1])
+ allow(work_package).to receive(:watcher_recipients).and_return([user_2])
work_package.save
end
@@ -73,7 +76,7 @@ describe WorkPackage, type: :model do
before do
ActionMailer::Base.deliveries.clear
- WorkPackageObserver.instance.send_notification = false
+ JournalManager.send_notification = false
work_package.save!
end
@@ -91,7 +94,7 @@ describe WorkPackage, type: :model do
subject { work_package.recipients }
- it { is_expected.to include(user_1.mail) }
+ it { is_expected.to include(user_1) }
end
end
end
diff --git a/spec/models/work_package/work_package_acts_as_journalized_spec.rb b/spec/models/work_package/work_package_acts_as_journalized_spec.rb
index 546a6925ff0..b9e67bb1cd4 100644
--- a/spec/models/work_package/work_package_acts_as_journalized_spec.rb
+++ b/spec/models/work_package/work_package_acts_as_journalized_spec.rb
@@ -162,7 +162,7 @@ describe WorkPackage, type: :model do
end
context 'last created journal' do
- subject { work_package.journals.last.changed_data }
+ subject { work_package.journals.last.details }
it 'contains all changes' do
[:subject, :description, :type_id, :status_id, :priority_id,
@@ -232,7 +232,7 @@ describe WorkPackage, type: :model do
end
context 'new attachment' do
- subject { work_package.journals.last.changed_data }
+ subject { work_package.journals.last.details }
it { is_expected.to have_key attachment_id }
@@ -254,7 +254,7 @@ describe WorkPackage, type: :model do
context 'attachment removed' do
before do work_package.attachments.delete(attachment) end
- subject { work_package.journals.last.changed_data }
+ subject { work_package.journals.last.details }
it { is_expected.to have_key attachment_id }
@@ -285,7 +285,7 @@ describe WorkPackage, type: :model do
context 'new custom value' do
include_context 'work package with custom value'
- subject { work_package.journals.last.changed_data }
+ subject { work_package.journals.last.details }
it { is_expected.to have_key custom_field_id }
@@ -305,7 +305,7 @@ describe WorkPackage, type: :model do
work_package.save!
end
- subject { work_package.journals.last.changed_data }
+ subject { work_package.journals.last.details }
it { is_expected.to have_key custom_field_id }
@@ -340,7 +340,7 @@ describe WorkPackage, type: :model do
work_package.save!
end
- subject { work_package.journals.last.changed_data }
+ subject { work_package.journals.last.details }
it { is_expected.to have_key custom_field_id }
diff --git a/spec/models/work_package/work_package_copy_spec.rb b/spec/models/work_package/work_package_copy_spec.rb
deleted file mode 100644
index 80fda7ce2d0..00000000000
--- a/spec/models/work_package/work_package_copy_spec.rb
+++ /dev/null
@@ -1,360 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-describe WorkPackage, type: :model do
- describe '#copy' do
- let(:user) { FactoryGirl.create(:user) }
- let(:custom_field) { FactoryGirl.create(:work_package_custom_field) }
- let(:source_type) {
- FactoryGirl.create(:type,
- custom_fields: [custom_field])
- }
- let(:source_project) {
- FactoryGirl.create(:project,
- types: [source_type])
- }
- let(:work_package) {
- FactoryGirl.create(:work_package,
- project: source_project,
- type: source_type,
- author: user)
- }
- let(:custom_value) {
- FactoryGirl.create(:work_package_custom_value,
- custom_field: custom_field,
- customized: work_package,
- value: false)
- }
-
- shared_examples_for 'copied work package' do
- subject { copy.id }
-
- it { is_expected.not_to eq(work_package.id) }
- end
-
- describe 'to the same project' do
- let(:copy) { work_package.move_to_project(source_project, nil, copy: true) }
-
- it_behaves_like 'copied work package'
-
- context 'project' do
- subject { copy.project }
-
- it { is_expected.to eq(source_project) }
- end
- end
-
- describe 'to a different project' do
- let(:target_type) { FactoryGirl.create(:type) }
- let(:target_project) {
- FactoryGirl.create(:project,
- types: [target_type])
- }
- let(:copy) { work_package.move_to_project(target_project, target_type, copy: true) }
-
- it_behaves_like 'copied work package'
-
- context 'project' do
- subject { copy.project_id }
-
- it { is_expected.to eq(target_project.id) }
- end
-
- context 'type' do
- subject { copy.type_id }
-
- it { is_expected.to eq(target_type.id) }
- end
-
- context 'custom_fields' do
- before do custom_value end
-
- subject { copy.custom_value_for(custom_field.id) }
-
- it { is_expected.to be_nil }
- end
-
- describe '#attributes' do
- let(:copy) {
- work_package.move_to_project(target_project,
- target_type,
- copy: true,
- attributes: attributes)
- }
-
- context 'assigned_to' do
- let(:target_user) { FactoryGirl.create(:user) }
- let(:target_project_member) {
- FactoryGirl.create(:member,
- project: target_project,
- principal: target_user,
- roles: [FactoryGirl.create(:role)])
- }
- let(:attributes) { { assigned_to_id: target_user.id } }
-
- before do target_project_member end
-
- it_behaves_like 'copied work package'
-
- subject { copy.assigned_to_id }
-
- it { is_expected.to eq(target_user.id) }
- end
-
- context 'status' do
- let(:target_status) { FactoryGirl.create(:status) }
- let(:attributes) { { status_id: target_status.id } }
-
- it_behaves_like 'copied work package'
-
- subject { copy.status_id }
-
- it { is_expected.to eq(target_status.id) }
- end
-
- context 'date' do
- let(:target_date) { Date.today + 14 }
-
- context 'start' do
- let(:attributes) { { start_date: target_date } }
-
- it_behaves_like 'copied work package'
-
- subject { copy.start_date }
-
- it { is_expected.to eq(target_date) }
- end
-
- context 'end' do
- let(:attributes) { { due_date: target_date } }
-
- it_behaves_like 'copied work package'
-
- subject { copy.due_date }
-
- it { is_expected.to eq(target_date) }
- end
- end
- end
-
- describe 'private project' do
- let(:role) {
- FactoryGirl.create(:role,
- permissions: [:view_work_packages])
- }
- let(:target_project) {
- FactoryGirl.create(:project,
- is_public: false,
- types: [target_type])
- }
- let(:source_project_member) {
- FactoryGirl.create(:member,
- project: source_project,
- principal: user,
- roles: [role])
- }
-
- before do
- source_project_member
- allow(User).to receive(:current).and_return user
- end
-
- it_behaves_like 'copied work package'
-
- context 'pre-condition' do
- subject { work_package.recipients }
-
- it { is_expected.to include(work_package.author.mail) }
- end
-
- subject { copy.recipients }
-
- it { is_expected.not_to include(copy.author.mail) }
- end
-
- describe 'with children' do
- let(:target_project) { FactoryGirl.create(:project, types: [source_type]) }
- let(:copy) { child.reload.move_to_project(target_project) }
- let!(:child) {
- FactoryGirl.create(:work_package, parent: work_package, project: source_project)
- }
- let!(:grandchild) {
- FactoryGirl.create(:work_package, parent: child, project: source_project)
- }
-
- context 'cross project relations deactivated' do
- before do
- allow(Setting).to receive(:cross_project_work_package_relations?).and_return(false)
- end
-
- it { expect(copy).to be_falsy }
-
- it { expect(child.reload.project).to eql(source_project) }
-
- describe 'grandchild' do
- before do copy end
-
- it { expect(grandchild.reload.project).to eql(source_project) }
- end
- end
-
- context 'cross project relations activated' do
- before do
- allow(Setting).to receive(:cross_project_work_package_relations?).and_return(true)
- end
-
- it { expect(copy).to be_truthy }
-
- it { expect(copy.project).to eql(target_project) }
-
- describe 'grandchild' do
- before do copy end
-
- it { expect(grandchild.reload.project).to eql(target_project) }
- end
- end
- end
- end
- end
-
- shared_context 'project with required custom field' do
- before do
- project.work_package_custom_fields << custom_field
- type.custom_fields << custom_field
-
- source.save
- end
- end
-
- before do
- def self.change_custom_field_value(work_package, value)
- work_package.custom_field_values = { custom_field.id => value } unless value.nil?
- work_package.save
- end
- end
-
- let(:type) { FactoryGirl.create(:type_standard) }
- let(:project) { FactoryGirl.create(:project, types: [type]) }
- let(:custom_field) {
- FactoryGirl.create(:work_package_custom_field,
- name: 'Database',
- field_format: 'list',
- possible_values: ['MySQL', 'PostgreSQL', 'Oracle'],
- is_required: true)
- }
-
- describe '#copy_from' do
- include_context 'project with required custom field'
-
- let(:source) { FactoryGirl.build(:work_package) }
- let(:sink) { FactoryGirl.build(:work_package) }
-
- before do
- source.project_id = project.id
- change_custom_field_value(source, 'MySQL')
- end
-
- shared_examples_for 'work package copy' do
- context 'subject' do
- subject { sink.subject }
-
- it { is_expected.to eq(source.subject) }
- end
-
- context 'type' do
- subject { sink.type }
-
- it { is_expected.to eq(source.type) }
- end
-
- context 'status' do
- subject { sink.status }
-
- it { is_expected.to eq(source.status) }
- end
-
- context 'project' do
- subject { sink.project_id }
-
- it { is_expected.to eq(project_id) }
- end
-
- context 'watchers' do
- subject { sink.watchers.map(&:user_id) }
-
- it do
- is_expected.to match_array(source.watchers.map(&:user_id))
- sink.watchers.each { |w| expect(w).to be_valid }
- end
- end
- end
-
- shared_examples_for 'work package copy with custom field' do
- it_behaves_like 'work package copy'
-
- context 'custom_field' do
- subject { sink.custom_value_for(custom_field.id).value }
-
- it { is_expected.to eq('MySQL') }
- end
- end
-
- context 'with project' do
- let(:project_id) { source.project_id }
-
- describe 'should copy project' do
- before do sink.copy_from(source) end
-
- it_behaves_like 'work package copy with custom field'
- end
-
- describe 'should not copy excluded project' do
- let(:project_id) { sink.project_id }
-
- before do sink.copy_from(source, exclude: [:project_id]) end
-
- it_behaves_like 'work package copy'
- end
-
- describe 'should copy over watchers' do
- let(:project_id) { sink.project_id }
- let(:stub_user) { FactoryGirl.create(:user, member_in_project: project) }
-
- before do
- source.watchers.build(user: stub_user, watchable: source)
-
- sink.copy_from(source)
- end
-
- it_behaves_like 'work package copy'
- end
- end
- end
-end
diff --git a/spec/models/work_package/work_package_planning_spec.rb b/spec/models/work_package/work_package_planning_spec.rb
index bc3b38243cb..554b8354297 100644
--- a/spec/models/work_package/work_package_planning_spec.rb
+++ b/spec/models/work_package/work_package_planning_spec.rb
@@ -249,7 +249,7 @@ describe WorkPackage, type: :model do
it "has an initial journal, so that it's creation shows up in activity" do
expect(pe.journals.size).to eq(1)
- changes = pe.journals.first.changed_data.to_hash
+ changes = pe.journals.first.details.to_hash
expect(changes.size).to eq(11)
@@ -271,7 +271,7 @@ describe WorkPackage, type: :model do
pe.update_attribute(:due_date, Date.new(2012, 2, 1))
expect(pe.journals.size).to eq(2)
- changes = pe.journals.last.changed_data
+ changes = pe.journals.last.details
expect(changes.size).to eq(1)
@@ -311,7 +311,7 @@ describe WorkPackage, type: :model do
pe.reload
expect(pe.journals.size).to eq(3)
- changes = pe.journals.last.changed_data
+ changes = pe.journals.last.details
expect(changes.size).to eq(1)
expect(changes).to include(:start_date)
diff --git a/spec/models/work_package_spec.rb b/spec/models/work_package_spec.rb
index 1843217af5e..f5d5489ab4f 100644
--- a/spec/models/work_package_spec.rb
+++ b/spec/models/work_package_spec.rb
@@ -481,170 +481,114 @@ describe WorkPackage, type: :model do
end
end
- describe '#move' do
- let(:work_package) {
- FactoryGirl.create(:work_package,
- project: project,
- type: type)
+ describe '#copy_from' do
+ let(:type) { FactoryGirl.create(:type_standard) }
+ let(:project) { FactoryGirl.create(:project, types: [type]) }
+ let(:custom_field) {
+ FactoryGirl.create(:work_package_custom_field,
+ name: 'Database',
+ field_format: 'list',
+ possible_values: ['MySQL', 'PostgreSQL', 'Oracle'],
+ is_required: true)
}
- let(:target_project) { FactoryGirl.create(:project) }
- shared_examples_for 'moved work package' do
- subject { work_package.project }
+ let(:source) { FactoryGirl.build(:work_package) }
+ let(:sink) { FactoryGirl.build(:work_package) }
- it { is_expected.to eq(target_project) }
+ before do
+ def self.change_custom_field_value(work_package, value)
+ work_package.custom_field_values = { custom_field.id => value } unless value.nil?
+ work_package.save
+ end
end
- describe '#time_entries' do
- let(:time_entry_1) {
- FactoryGirl.create(:time_entry,
- project: project,
- work_package: work_package)
- }
- let(:time_entry_2) {
- FactoryGirl.create(:time_entry,
- project: project,
- work_package: work_package)
- }
+ before do
+ project.work_package_custom_fields << custom_field
+ type.custom_fields << custom_field
- before do
- time_entry_1
- time_entry_2
-
- work_package.reload
- work_package.move_to_project(target_project)
-
- time_entry_1.reload
- time_entry_2.reload
- end
-
- context 'time entry 1' do
- subject { work_package.time_entries }
-
- it { is_expected.to include(time_entry_1) }
- end
-
- context 'time entry 2' do
- subject { work_package.time_entries }
-
- it { is_expected.to include(time_entry_2) }
- end
-
- it_behaves_like 'moved work package'
+ source.save
end
- describe '#category' do
- let(:category) {
- FactoryGirl.create(:category,
- project: project)
- }
+ before do
+ source.project_id = project.id
+ change_custom_field_value(source, 'MySQL')
+ end
- before do
- work_package.category = category
- work_package.save!
+ shared_examples_for 'work package copy' do
+ context 'subject' do
+ subject { sink.subject }
- work_package.reload
+ it { is_expected.to eq(source.subject) }
end
- context 'with same category' do
- let(:target_category) {
- FactoryGirl.create(:category,
- name: category.name,
- project: target_project)
- }
+ context 'type' do
+ subject { sink.type }
+
+ it { is_expected.to eq(source.type) }
+ end
+
+ context 'status' do
+ subject { sink.status }
+
+ it { is_expected.to eq(source.status) }
+ end
+
+ context 'project' do
+ subject { sink.project_id }
+
+ it { is_expected.to eq(project_id) }
+ end
+
+ context 'watchers' do
+ subject { sink.watchers.map(&:user_id) }
+
+ it do
+ is_expected.to match_array(source.watchers.map(&:user_id))
+ sink.watchers.each { |w| expect(w).to be_valid }
+ end
+ end
+ end
+
+ shared_examples_for 'work package copy with custom field' do
+ it_behaves_like 'work package copy'
+
+ context 'custom_field' do
+ subject { sink.custom_value_for(custom_field.id).value }
+
+ it { is_expected.to eq('MySQL') }
+ end
+ end
+
+ context 'with project' do
+ let(:project_id) { source.project_id }
+
+ describe 'should copy project' do
+
+ before { sink.copy_from(source) }
+
+ it_behaves_like 'work package copy with custom field'
+ end
+
+ describe 'should not copy excluded project' do
+ let(:project_id) { sink.project_id }
+
+ before { sink.copy_from(source, exclude: [:project_id]) }
+
+ it_behaves_like 'work package copy'
+ end
+
+ describe 'should copy over watchers' do
+ let(:project_id) { sink.project_id }
+ let(:stub_user) { FactoryGirl.create(:user, member_in_project: project) }
before do
- target_category
+ source.watchers.build(user: stub_user, watchable: source)
- work_package.move_to_project(target_project)
+ sink.copy_from(source)
end
- describe 'category moved' do
- subject { work_package.category_id }
-
- it { is_expected.to eq(target_category.id) }
- end
-
- it_behaves_like 'moved work package'
+ it_behaves_like 'work package copy'
end
-
- context 'w/o target category' do
- before do work_package.move_to_project(target_project) end
-
- describe 'category discarded' do
- subject { work_package.category_id }
-
- it { is_expected.to be_nil }
- end
-
- it_behaves_like 'moved work package'
- end
- end
-
- describe '#version' do
- let(:sharing) { 'none' }
- let(:version) {
- FactoryGirl.create(:version,
- status: 'open',
- project: project,
- sharing: sharing)
- }
- let(:work_package) {
- FactoryGirl.create(:work_package,
- fixed_version: version,
- project: project)
- }
-
- before do work_package.move_to_project(target_project) end
-
- it_behaves_like 'moved work package'
-
- context 'unshared version' do
- subject { work_package.fixed_version }
-
- it { is_expected.to be_nil }
- end
-
- context 'system wide shared version' do
- let(:sharing) { 'system' }
-
- subject { work_package.fixed_version }
-
- it { is_expected.to eq(version) }
- end
-
- context 'move work package in project hierarchy' do
- let(:target_project) {
- FactoryGirl.create(:project,
- parent: project)
- }
-
- context 'unshared version' do
- subject { work_package.fixed_version }
-
- it { is_expected.to be_nil }
- end
-
- context 'shared version' do
- let(:sharing) { 'tree' }
-
- subject { work_package.fixed_version }
-
- it { is_expected.to eq(version) }
- end
- end
- end
-
- describe '#type' do
- let(:target_type) { FactoryGirl.create(:type) }
- let(:target_project) {
- FactoryGirl.create(:project,
- types: [target_type])
- }
-
- subject { work_package.move_to_project(target_project) }
-
- it { is_expected.to be_falsey }
end
end
@@ -1037,7 +981,7 @@ describe WorkPackage, type: :model do
it { is_expected.not_to be_nil }
end
- let(:expected_users) { work_package.author.mail }
+ let(:expected_users) { work_package.author }
it_behaves_like 'includes expected users'
end
@@ -1051,7 +995,7 @@ describe WorkPackage, type: :model do
it { is_expected.not_to be_nil }
end
- let(:expected_users) { work_package.assigned_to.mail }
+ let(:expected_users) { work_package.assigned_to }
it_behaves_like 'includes expected users'
end
@@ -1333,36 +1277,104 @@ describe WorkPackage, type: :model do
end
describe '#allowed_target_projects_on_move' do
- let(:admin_user) { FactoryGirl.create :admin }
- let(:valid_user) { FactoryGirl.create :user }
let(:project) { FactoryGirl.create :project }
- context 'admin user' do
- before do
- allow(User).to receive(:current).and_return admin_user
- project
+ subject { WorkPackage.allowed_target_projects_on_move(user) }
+
+ before do
+ allow(User).to receive(:current).and_return user
+ project
+ end
+
+ shared_examples_for 'has the permission to see projects' do
+ it 'sees the project' do
+ is_expected.to match_array [project]
end
- subject { WorkPackage.allowed_target_projects_on_move.count }
+ it 'does not see the archived project' do
+ project.update_attribute(:status, Project::STATUS_ARCHIVED)
- it 'sees all active projects' do
- is_expected.to eq Project.active.count
+ is_expected.to match_array []
+ end
+
+ it 'does not see the project having the work package module disabled' do
+ enabled_modules = project.enabled_module_names.delete(:work_package_tracking)
+ project.enabled_module_names = enabled_modules
+ project.save!
+
+ is_expected.to match_array []
+ end
+ end
+
+ shared_examples_for 'lacks the permission to see projects' do
+ it 'does not see the project' do
+ is_expected.to match_array []
+ end
+ end
+
+ context 'admin user' do
+ let(:admin_user) { FactoryGirl.create :admin }
+
+ it_behaves_like 'has the permission to see projects' do
+ let(:user) { admin_user }
end
end
context 'non admin user' do
- before do
- allow(User).to receive(:current).and_return valid_user
+ let(:role) { FactoryGirl.build(:role, permissions: user_in_project_permissions) }
+ let(:user_in_project_permissions) { [:move_work_packages] }
+ let(:user_in_project) {
+ FactoryGirl.build :user,
+ member_in_project: project,
+ member_through_role: role
+ }
- role = FactoryGirl.create :role, permissions: [:move_work_packages]
+ it_behaves_like 'has the permission to see projects' do
+ before do
+ user_in_project.save!
+ end
- FactoryGirl.create(:member, user: valid_user, project: project, roles: [role])
+ let(:user) { user_in_project }
end
- subject { WorkPackage.allowed_target_projects_on_move.count }
+ it_behaves_like 'lacks the permission to see projects' do
+ let(:user_in_project_permissions) { [] }
- it 'sees all active projects' do
- is_expected.to eq Project.active.count
+ before do
+ user_in_project.save!
+ end
+
+ let(:user) { user_in_project }
+ end
+ end
+
+ context 'non member user' do
+ it_behaves_like 'lacks the permission to see projects' do
+ before do
+ project.update_attribute(:is_public, true)
+ FactoryGirl.create(:non_member, permissions: [])
+ end
+
+ let(:user) { FactoryGirl.create(:user) }
+ end
+
+ it_behaves_like 'has the permission to see projects' do
+ before do
+ project.update_attribute(:is_public, true)
+ FactoryGirl.create(:non_member, permissions: [:move_work_packages])
+ end
+
+ let(:user) { FactoryGirl.create(:user) }
+ end
+ end
+
+ context 'anonymous user' do
+ it_behaves_like 'lacks the permission to see projects' do
+ before do
+ project.update_attribute(:is_public, true)
+ end
+
+ let(:user) { FactoryGirl.create(:anonymous) }
end
end
end
@@ -1491,20 +1503,20 @@ describe WorkPackage, type: :model do
it 'should not include certain attributes' do
recreated_journal = @issue.recreate_initial_journal!
- expect(recreated_journal.changed_data.include?('rgt')).to eq(false)
- expect(recreated_journal.changed_data.include?('lft')).to eq(false)
- expect(recreated_journal.changed_data.include?('lock_version')).to eq(false)
- expect(recreated_journal.changed_data.include?('updated_at')).to eq(false)
- expect(recreated_journal.changed_data.include?('updated_on')).to eq(false)
- expect(recreated_journal.changed_data.include?('id')).to eq(false)
- expect(recreated_journal.changed_data.include?('type')).to eq(false)
- expect(recreated_journal.changed_data.include?('root_id')).to eq(false)
+ expect(recreated_journal.details.include?('rgt')).to eq(false)
+ expect(recreated_journal.details.include?('lft')).to eq(false)
+ expect(recreated_journal.details.include?('lock_version')).to eq(false)
+ expect(recreated_journal.details.include?('updated_at')).to eq(false)
+ expect(recreated_journal.details.include?('updated_on')).to eq(false)
+ expect(recreated_journal.details.include?('id')).to eq(false)
+ expect(recreated_journal.details.include?('type')).to eq(false)
+ expect(recreated_journal.details.include?('root_id')).to eq(false)
end
it 'should not include useless transitions' do
recreated_journal = @issue.recreate_initial_journal!
- recreated_journal.changed_data.values.each do |change|
+ recreated_journal.details.values.each do |change|
expect(change.first).not_to eq(change.last)
end
end
diff --git a/spec/requests/api/v3/work_packages_api_spec.rb b/spec/requests/api/v3/activities_by_work_package_resource_spec.rb
similarity index 97%
rename from spec/requests/api/v3/work_packages_api_spec.rb
rename to spec/requests/api/v3/activities_by_work_package_resource_spec.rb
index 86435bdfc1d..cade61fdd3f 100644
--- a/spec/requests/api/v3/work_packages_api_spec.rb
+++ b/spec/requests/api/v3/activities_by_work_package_resource_spec.rb
@@ -29,7 +29,7 @@
require 'spec_helper'
require 'rack/test'
-describe API::V3::WorkPackages::WorkPackagesAPI, type: :request do
+describe API::V3::Activities::ActivitiesByWorkPackageAPI, type: :request do
include API::V3::Utilities::PathHelper
let(:admin) { FactoryGirl.create(:admin) }
diff --git a/spec/requests/api/v3/activity_resource_spec.rb b/spec/requests/api/v3/activity_resource_spec.rb
index f9bb1eaadcc..7c12eae4049 100644
--- a/spec/requests/api/v3/activity_resource_spec.rb
+++ b/spec/requests/api/v3/activity_resource_spec.rb
@@ -33,11 +33,19 @@ describe 'API v3 Activity resource', type: :request do
include Rack::Test::Methods
include API::V3::Utilities::PathHelper
- let(:current_user) { FactoryGirl.create(:user) }
+ let(:current_user) {
+ FactoryGirl.create(:user, member_in_project: project, member_through_role: role)
+ }
let(:project) { FactoryGirl.create(:project, is_public: false) }
let(:work_package) { FactoryGirl.create(:work_package, author: current_user, project: project) }
- let(:role) { FactoryGirl.create(:role, permissions: [:view_work_packages]) }
- let(:activity) { FactoryGirl.create(:work_package_journal, journable: work_package) }
+ let(:role) { FactoryGirl.create(:role, permissions: permissions) }
+ let(:permissions) { [:view_work_packages, :edit_work_package_notes] }
+ let(:activity) { work_package.journals.first }
+
+ before do
+ allow(User).to receive(:current).and_return current_user
+ work_package.save!
+ end
describe '#get' do
subject(:response) { last_response }
@@ -45,10 +53,6 @@ describe 'API v3 Activity resource', type: :request do
context 'logged in user' do
let(:get_path) { api_v3_paths.activity activity.id }
before do
- allow(User).to receive(:current).and_return current_user
- member = FactoryGirl.build(:member, user: current_user, project: project)
- member.role_ids = [role.id]
- member.save!
get get_path
end
@@ -80,9 +84,40 @@ describe 'API v3 Activity resource', type: :request do
end
end
- it_behaves_like 'handling anonymous user', 'Activity', '/api/v3/activities/%s' do
+ it_behaves_like 'handling anonymous user' do
let(:project) { FactoryGirl.create(:project, is_public: true) }
- let(:id) { activity.id }
+ let(:path) { api_v3_paths.activity activity.id }
+ end
+ end
+
+ describe '#patch' do
+ subject(:response) { last_response }
+ let(:patch_path) { api_v3_paths.activity activity.id }
+ let(:valid_params) {
+ {
+ comment: 'a fancy comment!'
+ }
+ }
+
+ context 'authorized user' do
+ before do
+ patch patch_path, valid_params.to_json, 'CONTENT_TYPE' => 'application/json'
+ end
+
+ subject(:response) { last_response }
+
+ it 'should respond with HTTP OK' do
+ expect(subject.status).to eq(200)
+ end
+
+ it 'changes the comment' do
+ activity.reload
+ expect(activity.notes).to eql 'a fancy comment!'
+ end
+
+ it 'responds with the updated activity' do
+ expect(subject.body).to be_json_eql('a fancy comment!'.to_json).at_path('comment/raw')
+ end
end
end
end
diff --git a/spec/requests/api/v3/repositories/revisions_by_work_package_resource_spec.rb b/spec/requests/api/v3/repositories/revisions_by_work_package_resource_spec.rb
new file mode 100644
index 00000000000..5e43af9ab2b
--- /dev/null
+++ b/spec/requests/api/v3/repositories/revisions_by_work_package_resource_spec.rb
@@ -0,0 +1,98 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+require 'rack/test'
+
+describe 'API v3 Revisions by work package resource', type: :request do
+ include Rack::Test::Methods
+ include API::V3::Utilities::PathHelper
+ include FileHelpers
+
+ let(:current_user) {
+ FactoryGirl.create(:user,
+ member_in_project: project,
+ member_through_role: role)
+ }
+ let(:project) { FactoryGirl.create(:project, is_public: false) }
+ let(:role) { FactoryGirl.create(:role, permissions: permissions) }
+ let(:permissions) { [:view_work_packages, :view_changesets] }
+ let(:repository) { FactoryGirl.create(:repository_subversion, project: project) }
+ let(:work_package) { FactoryGirl.create(:work_package, author: current_user, project: project) }
+ let(:revisions) { [] }
+
+ subject(:response) { last_response }
+
+ before do
+ allow(User).to receive(:current).and_return current_user
+ end
+
+ describe '#get' do
+ let(:get_path) { api_v3_paths.work_package_revisions work_package.id }
+
+ before do
+ revisions.each do |rev| rev.save! end
+ get get_path
+ end
+
+ it 'should respond with 200' do
+ expect(subject.status).to eq(200)
+ end
+
+ it_behaves_like 'API V3 collection response', 0, 0, 'Revision'
+
+
+ context 'with existing revisions' do
+ let(:revisions) {
+ FactoryGirl.build_list(:changeset,
+ 5,
+ comments: "This commit references ##{work_package.id}",
+ repository: repository
+ )
+ }
+
+ it_behaves_like 'API V3 collection response', 5, 5, 'Revision'
+ end
+
+ context 'user unauthorized to view work package' do
+ let(:current_user) { FactoryGirl.create(:user) }
+
+ it 'should respond with 404' do
+ expect(subject.status).to eq(404)
+ end
+ end
+
+ context 'user unauthorized to view revisions' do
+ let(:permissions) { [:view_work_packages] }
+
+ it 'should respond with 403' do
+ expect(subject.status).to eq(403)
+ end
+ end
+ end
+end
diff --git a/spec/requests/api/v3/repositories/revisions_resource_spec.rb b/spec/requests/api/v3/repositories/revisions_resource_spec.rb
new file mode 100644
index 00000000000..e0948814a11
--- /dev/null
+++ b/spec/requests/api/v3/repositories/revisions_resource_spec.rb
@@ -0,0 +1,97 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+require 'rack/test'
+
+describe 'API v3 Revisions resource', type: :request do
+ include Rack::Test::Methods
+ include Capybara::RSpecMatchers
+ include API::V3::Utilities::PathHelper
+
+ let(:revision) {
+ FactoryGirl.create(:changeset,
+ repository: repository,
+ comments: 'Some commit message',
+ committer: 'foo bar '
+ )
+ }
+ let(:repository) {
+ FactoryGirl.create(:repository_subversion, project: project)
+ }
+ let(:project) {
+ FactoryGirl.create(:project, identifier: 'test_project', is_public: false)
+ }
+ let(:role) {
+ FactoryGirl.create(:role,
+ permissions: [:view_changesets])
+ }
+ let(:current_user) {
+ FactoryGirl.create(:user, member_in_project: project, member_through_role: role)
+ }
+
+ let(:unauthorized_user) { FactoryGirl.create(:user) }
+
+ describe '#get' do
+ let(:get_path) { api_v3_paths.revision revision.id }
+
+ context 'when acting as a user with permission to view revisions' do
+ before(:each) do
+ allow(User).to receive(:current).and_return current_user
+ get get_path
+ end
+
+ it 'should respond with 200' do
+ expect(last_response.status).to eq(200)
+ end
+
+ describe 'response body' do
+ subject(:response) { last_response.body }
+
+ it 'should respond with revision in HAL+JSON format' do
+ is_expected.to be_json_eql(revision.id.to_json).at_path('id')
+ end
+ end
+
+ context 'requesting nonexistent revision' do
+ let(:get_path) { api_v3_paths.revision 909090 }
+
+ it_behaves_like 'not found'
+ end
+ end
+
+ context 'when acting as an user without permission to view work package' do
+ before(:each) do
+ allow(User).to receive(:current).and_return unauthorized_user
+ get get_path
+ end
+
+ it_behaves_like 'not found'
+ end
+ end
+end
diff --git a/spec/requests/api/v3/support/authorization.rb b/spec/requests/api/v3/support/authorization.rb
index 29f6906e753..d0fa4203af4 100644
--- a/spec/requests/api/v3/support/authorization.rb
+++ b/spec/requests/api/v3/support/authorization.rb
@@ -28,27 +28,16 @@
require 'spec_helper'
-shared_examples_for 'handling anonymous user' do |type, path|
+shared_examples_for 'handling anonymous user' do
context 'anonymous user' do
- let(:get_path) { path % [id] }
-
- context 'when access for anonymous user is allowed' do
- before do get get_path end
-
- it 'should respond with 200' do
- expect(subject.status).to eq(200)
- end
-
- it 'should respond with correct type' do
- expect(subject.body).to include_json(type.to_json).at_path('_type')
- expect(subject.body).to be_json_eql(id.to_json).at_path('id')
- end
+ before do
+ allow(User).to receive(:current).and_return(User.anonymous)
end
context 'when access for anonymous user is not allowed' do
before do
allow(Setting).to receive(:login_required?).and_return(true)
- get get_path
+ get path
end
it_behaves_like 'unauthenticated access'
diff --git a/spec/requests/api/v3/user_resource_spec.rb b/spec/requests/api/v3/user_resource_spec.rb
index 22338dea80f..bdf115eabdc 100644
--- a/spec/requests/api/v3/user_resource_spec.rb
+++ b/spec/requests/api/v3/user_resource_spec.rb
@@ -66,8 +66,8 @@ describe 'API v3 User resource', type: :request do
end
end
- it_behaves_like 'handling anonymous user', 'User', '/api/v3/users/%s' do
- let(:id) { user.id }
+ it_behaves_like 'handling anonymous user' do
+ let(:path) { api_v3_paths.user user.id }
end
end
diff --git a/spec/routing/repositories_routing_spec.rb b/spec/routing/repositories_routing_spec.rb
index 23fcddb5e84..dc4b98dc034 100644
--- a/spec/routing/repositories_routing_spec.rb
+++ b/spec/routing/repositories_routing_spec.rb
@@ -31,219 +31,267 @@ require 'spec_helper'
describe RepositoriesController, type: :routing do
describe 'show' do
it {
- expect(get('/projects/testproject/repository')).to route_to(controller: 'repositories',
- action: 'show',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository'))
+ .to route_to(controller: 'repositories',
+ action: 'show',
+ project_id: 'testproject')
}
it {
- expect(get('/projects/testproject/repository/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'show',
- project_id: 'testproject',
- path: 'path/to/file.c')
+ expect(get('/projects/testproject/repository/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'show',
+ project_id: 'testproject',
+ path: 'path/to/file.c')
}
it {
- expect(get('/projects/testproject/repository/revisions/5')).to route_to(controller: 'repositories',
- action: 'show',
- rev: '5',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/revisions/5'))
+ .to route_to(controller: 'repositories',
+ action: 'show',
+ rev: '5',
+ project_id: 'testproject')
}
end
describe 'edit' do
it {
- expect(get('/projects/testproject/repository/edit')).to route_to(controller: 'repositories',
- action: 'edit',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/edit'))
+ .to route_to(controller: 'repositories',
+ action: 'edit',
+ project_id: 'testproject')
}
+ end
+ describe 'create' do
it {
- expect(post('/projects/testproject/repository/edit')).to route_to(controller: 'repositories',
- action: 'edit',
- project_id: 'testproject')
+ expect(post('/projects/testproject/repository/'))
+ .to route_to(controller: 'repositories',
+ action: 'create',
+ project_id: 'testproject')
+ }
+ end
+
+ describe 'update' do
+ it {
+ expect(put('/projects/testproject/repository/'))
+ .to route_to(controller: 'repositories',
+ action: 'update',
+ project_id: 'testproject')
}
end
describe 'revisions' do
it {
- expect(get('/projects/testproject/repository/revisions')).to route_to(controller: 'repositories',
- action: 'revisions',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/revisions'))
+ .to route_to(controller: 'repositories',
+ action: 'revisions',
+ project_id: 'testproject')
}
it {
- expect(get('/projects/testproject/repository/revisions.atom')).to route_to(controller: 'repositories',
- action: 'revisions',
- project_id: 'testproject',
- format: 'atom')
+ expect(get('/projects/testproject/repository/revisions.atom'))
+ .to route_to(controller: 'repositories',
+ action: 'revisions',
+ project_id: 'testproject',
+ format: 'atom')
}
end
describe 'revision' do
it {
- expect(get('/projects/testproject/repository/revision/2457')).to route_to(controller: 'repositories',
- action: 'revision',
- project_id: 'testproject',
- rev: '2457')
+ expect(get('/projects/testproject/repository/revision/2457'))
+ .to route_to(controller: 'repositories',
+ action: 'revision',
+ project_id: 'testproject',
+ rev: '2457')
}
it {
- expect(get('/projects/testproject/repository/revision')).to route_to(controller: 'repositories',
- action: 'revision',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/revision'))
+ .to route_to(controller: 'repositories',
+ action: 'revision',
+ project_id: 'testproject')
}
end
describe 'diff' do
it {
- expect(get('/projects/testproject/repository/revisions/2457/diff')).to route_to(controller: 'repositories',
- action: 'diff',
- project_id: 'testproject',
- rev: '2457')
+ expect(get('/projects/testproject/repository/revisions/2457/diff'))
+ .to route_to(controller: 'repositories',
+ action: 'diff',
+ project_id: 'testproject',
+ rev: '2457')
}
it {
- expect(get('/projects/testproject/repository/revisions/2457/diff.diff')).to route_to(controller: 'repositories',
- action: 'diff',
- project_id: 'testproject',
- rev: '2457',
- format: 'diff')
+ expect(get('/projects/testproject/repository/revisions/2457/diff.diff'))
+ .to route_to(controller: 'repositories',
+ action: 'diff',
+ project_id: 'testproject',
+ rev: '2457',
+ format: 'diff')
}
it {
- expect(get('/projects/testproject/repository/diff')).to route_to(controller: 'repositories',
- action: 'diff',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/diff'))
+ .to route_to(controller: 'repositories',
+ action: 'diff',
+ project_id: 'testproject')
}
it {
- expect(get('/projects/testproject/repository/diff/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'diff',
- project_id: 'testproject',
- path: 'path/to/file.c')
+ expect(get('/projects/testproject/repository/diff/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'diff',
+ project_id: 'testproject',
+ path: 'path/to/file.c')
}
it {
- expect(get('/projects/testproject/repository/revisions/2/diff/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'diff',
- project_id: 'testproject',
- path: 'path/to/file.c',
- rev: '2')
+ expect(get('/projects/testproject/repository/revisions/2/diff/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'diff',
+ project_id: 'testproject',
+ path: 'path/to/file.c',
+ rev: '2')
}
end
describe 'browse' do
it {
- expect(get('/projects/testproject/repository/browse/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'browse',
- project_id: 'testproject',
- path: 'path/to/file.c')
+ expect(get('/projects/testproject/repository/browse/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'browse',
+ project_id: 'testproject',
+ path: 'path/to/file.c')
}
end
describe 'entry' do
it {
- expect(get('/projects/testproject/repository/entry/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'entry',
- project_id: 'testproject',
- path: 'path/to/file.c')
+ expect(get('/projects/testproject/repository/entry/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'entry',
+ project_id: 'testproject',
+ path: 'path/to/file.c')
}
it {
- expect(get('/projects/testproject/repository/revisions/2/entry/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'entry',
- project_id: 'testproject',
- path: 'path/to/file.c',
- rev: '2')
+ expect(get('/projects/testproject/repository/revisions/2/entry/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'entry',
+ project_id: 'testproject',
+ path: 'path/to/file.c',
+ rev: '2')
}
it {
- expect(get('/projects/testproject/repository/raw/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'entry',
- project_id: 'testproject',
- path: 'path/to/file.c',
- format: 'raw')
+ expect(get('/projects/testproject/repository/raw/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'entry',
+ project_id: 'testproject',
+ path: 'path/to/file.c',
+ format: 'raw')
}
it {
- expect(get('/projects/testproject/repository/revisions/master/raw/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'entry',
- project_id: 'testproject',
- path: 'path/to/file.c',
- rev: 'master',
- format: 'raw')
+ expect(get('/projects/testproject/repository/revisions/master/raw/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'entry',
+ project_id: 'testproject',
+ path: 'path/to/file.c',
+ rev: 'master',
+ format: 'raw')
}
end
describe 'annotate' do
it {
- expect(get('/projects/testproject/repository/annotate/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'annotate',
- project_id: 'testproject',
- path: 'path/to/file.c')
+ expect(get('/projects/testproject/repository/annotate/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'annotate',
+ project_id: 'testproject',
+ path: 'path/to/file.c')
}
it {
- expect(get('/projects/testproject/repository/revisions/5/annotate/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'annotate',
- project_id: 'testproject',
- path: 'path/to/file.c',
- rev: '5')
+ expect(get('/projects/testproject/repository/revisions/5/annotate/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'annotate',
+ project_id: 'testproject',
+ path: 'path/to/file.c',
+ rev: '5')
}
end
describe 'changes' do
it {
- expect(get('/projects/testproject/repository/changes/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'changes',
- project_id: 'testproject',
- path: 'path/to/file.c')
+ expect(get('/projects/testproject/repository/changes/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'changes',
+ project_id: 'testproject',
+ path: 'path/to/file.c')
}
it {
- expect(get('/projects/testproject/repository/revisions/5/changes/path/to/file.c')).to route_to(controller: 'repositories',
- action: 'changes',
- project_id: 'testproject',
- path: 'path/to/file.c',
- rev: '5')
+ expect(get('/projects/testproject/repository/revisions/5/changes/path/to/file.c'))
+ .to route_to(controller: 'repositories',
+ action: 'changes',
+ project_id: 'testproject',
+ path: 'path/to/file.c',
+ rev: '5')
}
end
describe 'stats' do
it {
- expect(get('/projects/testproject/repository/statistics')).to route_to(controller: 'repositories',
- action: 'stats',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/statistics'))
+ .to route_to(controller: 'repositories',
+ action: 'stats',
+ project_id: 'testproject')
}
end
describe 'committers' do
it {
- expect(get('/projects/testproject/repository/committers')).to route_to(controller: 'repositories',
- action: 'committers',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/committers'))
+ .to route_to(controller: 'repositories',
+ action: 'committers',
+ project_id: 'testproject')
}
it {
- expect(post('/projects/testproject/repository/committers')).to route_to(controller: 'repositories',
- action: 'committers',
- project_id: 'testproject')
+ expect(post('/projects/testproject/repository/committers'))
+ .to route_to(controller: 'repositories',
+ action: 'committers',
+ project_id: 'testproject')
}
end
describe 'graph' do
it {
- expect(get('/projects/testproject/repository/graph')).to route_to(controller: 'repositories',
- action: 'graph',
- project_id: 'testproject')
+ expect(get('/projects/testproject/repository/graph'))
+ .to route_to(controller: 'repositories',
+ action: 'graph',
+ project_id: 'testproject')
}
end
describe 'destroy' do
it {
- expect(delete('/projects/testproject/repository')).to route_to(controller: 'repositories',
- action: 'destroy',
- project_id: 'testproject')
+ expect(delete('/projects/testproject/repository'))
+ .to route_to(controller: 'repositories',
+ action: 'destroy',
+ project_id: 'testproject')
+ }
+ end
+
+ describe 'destroy_info' do
+ it {
+ expect(get('/projects/testproject/repository/destroy_info'))
+ .to route_to(controller: 'repositories',
+ action: 'destroy_info',
+ project_id: 'testproject')
}
end
end
diff --git a/spec/services/add_attachment_service_spec.rb b/spec/services/add_attachment_service_spec.rb
new file mode 100644
index 00000000000..97bc8ffaec2
--- /dev/null
+++ b/spec/services/add_attachment_service_spec.rb
@@ -0,0 +1,87 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+
+require 'spec_helper'
+
+describe AddAttachmentService do
+ let(:user) { FactoryGirl.create(:user) }
+ let(:work_package) { FactoryGirl.build(:work_package) }
+ let(:container) { work_package }
+ let(:description) { 'a fancy description' }
+
+ subject { described_class.new(work_package, author: user) }
+
+ describe '#add_attachment' do
+ def call_tested_method
+ subject.add_attachment uploaded_file: FileHelpers.mock_uploaded_file(name: 'foobar.txt'),
+ description: description
+ end
+
+ context 'happy path' do
+ before do
+ call_tested_method
+ end
+
+ it 'should save the attachment' do
+ attachment = Attachment.first
+ expect(attachment.filename).to eq 'foobar.txt'
+ expect(attachment.description).to eq description
+ end
+
+ it 'should add the attachment to the WP' do
+ work_package.reload
+ expect(work_package.attachments).to include Attachment.first
+ end
+
+ it 'should add a journal entry on the WP' do
+ expect(work_package.journals.count).to eq 2 # 1 for WP creation + 1 for the attachment
+ end
+ end
+
+ context "can't save work package" do
+ before do
+ allow(work_package).to receive(:save!)
+ .and_raise(ActiveRecord::RecordInvalid.new(work_package))
+ end
+
+ it 'should raise the exception' do
+ expect { call_tested_method }.to raise_error ActiveRecord::RecordInvalid
+ end
+
+ it 'should not save the attachment' do
+ begin
+ call_tested_method
+ rescue ActiveRecord::RecordInvalid
+ # we expect that to happen
+ end
+
+ expect(Attachment.count).to eq 0
+ end
+ end
+ end
+end
diff --git a/spec/app/services/create_work_package_service_spec.rb b/spec/services/create_work_package_service_spec.rb
similarity index 100%
rename from spec/app/services/create_work_package_service_spec.rb
rename to spec/services/create_work_package_service_spec.rb
diff --git a/spec/services/move_work_package_service_spec.rb b/spec/services/move_work_package_service_spec.rb
new file mode 100644
index 00000000000..09493702fb1
--- /dev/null
+++ b/spec/services/move_work_package_service_spec.rb
@@ -0,0 +1,493 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe MoveWorkPackageService, type: :model do
+ let(:user) { FactoryGirl.create(:user) }
+ let(:type) { FactoryGirl.create(:type_standard) }
+ let(:project) { FactoryGirl.create(:project, types: [type]) }
+ let(:work_package) {
+ FactoryGirl.create(:work_package,
+ project: project,
+ type: type)
+ }
+ let(:instance) { MoveWorkPackageService.new(work_package, user) }
+
+ before do
+ allow(User).to receive(:current).and_return(user)
+ end
+
+ def mock_allowed_to_move_to_project(project, is_allowed = true)
+ allowed_scope = double('allowed_scope', :'exists?' => is_allowed)
+
+ allow(WorkPackage)
+ .to receive(:allowed_target_projects_on_move)
+ .with(user)
+ .and_return(allowed_scope)
+
+ allow(allowed_scope)
+ .to receive(:where)
+ .with(id: project.id)
+ .and_return(allowed_scope)
+ end
+
+ describe '#call' do
+ context 'when moving' do
+ let(:target_project) { FactoryGirl.create(:project) }
+
+ before do
+ work_package
+
+ mock_allowed_to_move_to_project(target_project, true)
+ end
+
+ shared_examples_for 'moved work package' do
+ subject { work_package.project }
+
+ it { is_expected.to eq(target_project) }
+ end
+
+ context 'the project the work package is moved to' do
+ it_behaves_like 'moved work package' do
+ before do
+ instance.call(target_project)
+ end
+ end
+
+ it 'will not move if the user does not have the permission' do
+ mock_allowed_to_move_to_project(target_project, false)
+
+ instance.call(target_project)
+
+ expect(work_package.project).to eql(project)
+ end
+ end
+
+ describe '#time_entries' do
+ let(:time_entry_1) {
+ FactoryGirl.create(:time_entry,
+ project: project,
+ work_package: work_package)
+ }
+ let(:time_entry_2) {
+ FactoryGirl.create(:time_entry,
+ project: project,
+ work_package: work_package)
+ }
+
+ before do
+ time_entry_1
+ time_entry_2
+
+ work_package.reload
+ instance.call(target_project)
+
+ time_entry_1.reload
+ time_entry_2.reload
+ end
+
+ context 'time entry 1' do
+ subject { work_package.time_entries }
+
+ it { is_expected.to include(time_entry_1) }
+ end
+
+ context 'time entry 2' do
+ subject { work_package.time_entries }
+
+ it { is_expected.to include(time_entry_2) }
+ end
+
+ it_behaves_like 'moved work package'
+ end
+
+ describe '#category' do
+ let(:category) {
+ FactoryGirl.create(:category,
+ project: project)
+ }
+
+ before do
+ work_package.category = category
+ work_package.save!
+
+ work_package.reload
+ end
+
+ context 'with same category' do
+ let(:target_category) {
+ FactoryGirl.create(:category,
+ name: category.name,
+ project: target_project)
+ }
+
+ before do
+ target_category
+
+ instance.call(target_project)
+ end
+
+ describe 'category moved' do
+ subject { work_package.category_id }
+
+ it { is_expected.to eq(target_category.id) }
+ end
+
+ it_behaves_like 'moved work package'
+ end
+
+ context 'w/o target category' do
+ before do
+ instance.call(target_project)
+ end
+
+ describe 'category discarded' do
+ subject { work_package.category_id }
+
+ it { is_expected.to be_nil }
+ end
+
+ it_behaves_like 'moved work package'
+ end
+ end
+
+ describe '#version' do
+ let(:sharing) { 'none' }
+ let(:version) {
+ FactoryGirl.create(:version,
+ status: 'open',
+ project: project,
+ sharing: sharing)
+ }
+ let(:work_package) {
+ FactoryGirl.create(:work_package,
+ fixed_version: version,
+ project: project)
+ }
+
+ before do
+ instance.call(target_project)
+ end
+
+ it_behaves_like 'moved work package'
+
+ context 'unshared version' do
+ subject { work_package.fixed_version }
+
+ it { is_expected.to be_nil }
+ end
+
+ context 'system wide shared version' do
+ let(:sharing) { 'system' }
+
+ subject { work_package.fixed_version }
+
+ it { is_expected.to eq(version) }
+ end
+
+ context 'move work package in project hierarchy' do
+ let(:target_project) {
+ FactoryGirl.create(:project,
+ parent: project)
+ }
+
+ context 'unshared version' do
+ subject { work_package.fixed_version }
+
+ it { is_expected.to be_nil }
+ end
+
+ context 'shared version' do
+ let(:sharing) { 'tree' }
+
+ subject { work_package.fixed_version }
+
+ it { is_expected.to eq(version) }
+ end
+ end
+ end
+
+ describe '#type' do
+ let(:target_type) { FactoryGirl.create(:type) }
+ let(:target_project) {
+ FactoryGirl.create(:project,
+ types: [target_type])
+ }
+
+ it 'is false if the current type is not defined for the new project' do
+ expect(instance.call(target_project)).to be_falsey
+ end
+ end
+ end
+
+ describe 'when copying' do
+ let(:custom_field) { FactoryGirl.create(:work_package_custom_field) }
+ let(:source_type) {
+ FactoryGirl.create(:type,
+ custom_fields: [custom_field])
+ }
+ let(:source_project) {
+ FactoryGirl.create(:project,
+ types: [source_type])
+ }
+ let(:work_package) {
+ FactoryGirl.create(:work_package,
+ project: source_project,
+ type: source_type,
+ author: user)
+ }
+ let(:custom_value) {
+ FactoryGirl.create(:work_package_custom_value,
+ custom_field: custom_field,
+ customized: work_package,
+ value: false)
+ }
+
+ shared_examples_for 'copied work package' do
+ subject { copy.id }
+
+ it { is_expected.not_to eq(work_package.id) }
+ end
+
+ describe 'to the same project' do
+ let(:copy) {
+ mock_allowed_to_move_to_project(source_project)
+ instance.call(source_project, nil, copy: true)
+ }
+
+ it_behaves_like 'copied work package'
+
+ context 'project' do
+ subject { copy.project }
+
+ it { is_expected.to eq(source_project) }
+ end
+ end
+
+ describe 'to a different project' do
+ let(:target_type) { FactoryGirl.create(:type) }
+ let(:target_project) {
+ FactoryGirl.create(:project,
+ types: [target_type])
+ }
+ let(:copy) do
+ mock_allowed_to_move_to_project(target_project)
+ instance.call(target_project, target_type, copy: true)
+ end
+
+ it_behaves_like 'copied work package'
+
+ context 'project' do
+ subject { copy.project_id }
+
+ it { is_expected.to eq(target_project.id) }
+ end
+
+ context 'type' do
+ subject { copy.type_id }
+
+ it { is_expected.to eq(target_type.id) }
+ end
+
+ context 'custom_fields' do
+ before do
+ custom_value
+ end
+
+ subject { copy.custom_value_for(custom_field.id) }
+
+ it { is_expected.to be_nil }
+ end
+
+ describe '#attributes' do
+ let(:copy) {
+ mock_allowed_to_move_to_project(target_project)
+ instance.call(target_project,
+ target_type,
+ copy: true,
+ attributes: attributes)
+ }
+
+ context 'assigned_to' do
+ let(:target_user) { FactoryGirl.create(:user) }
+ let(:target_project_member) {
+ FactoryGirl.create(:member,
+ project: target_project,
+ principal: target_user,
+ roles: [FactoryGirl.create(:role)])
+ }
+ let(:attributes) { { assigned_to_id: target_user.id } }
+
+ before do
+ target_project_member
+ end
+
+ it_behaves_like 'copied work package'
+
+ subject { copy.assigned_to_id }
+
+ it { is_expected.to eq(target_user.id) }
+ end
+
+ context 'status' do
+ let(:target_status) { FactoryGirl.create(:status) }
+ let(:attributes) { { status_id: target_status.id } }
+
+ it_behaves_like 'copied work package'
+
+ subject { copy.status_id }
+
+ it { is_expected.to eq(target_status.id) }
+ end
+
+ context 'date' do
+ let(:target_date) { Date.today + 14 }
+
+ context 'start' do
+ let(:attributes) { { start_date: target_date } }
+
+ it_behaves_like 'copied work package'
+
+ subject { copy.start_date }
+
+ it { is_expected.to eq(target_date) }
+ end
+
+ context 'end' do
+ let(:attributes) { { due_date: target_date } }
+
+ it_behaves_like 'copied work package'
+
+ subject { copy.due_date }
+
+ it { is_expected.to eq(target_date) }
+ end
+ end
+ end
+
+ describe 'private project' do
+ let(:role) {
+ FactoryGirl.create(:role,
+ permissions: [:view_work_packages])
+ }
+ let(:target_project) {
+ FactoryGirl.create(:project,
+ is_public: false,
+ types: [target_type])
+ }
+ let(:source_project_member) {
+ FactoryGirl.create(:member,
+ project: source_project,
+ principal: user,
+ roles: [role])
+ }
+
+ before do
+ source_project_member
+ allow(User).to receive(:current).and_return user
+ end
+
+ it_behaves_like 'copied work package'
+
+ context 'pre-condition' do
+ subject { work_package.recipients }
+
+ it { is_expected.to include(work_package.author) }
+ end
+
+ subject { copy.recipients }
+
+ it { is_expected.not_to include(copy.author) }
+ end
+
+ describe 'with children' do
+ let(:target_project) { FactoryGirl.create(:project, types: [source_type]) }
+ let(:instance) { MoveWorkPackageService.new(child, user) }
+ let(:copy) do
+ mock_allowed_to_move_to_project(target_project)
+
+ child.reload
+
+ instance.call(target_project)
+ end
+ let!(:child) {
+ FactoryGirl.create(:work_package, parent: work_package, project: source_project)
+ }
+ let!(:grandchild) {
+ FactoryGirl.create(:work_package, parent: child, project: source_project)
+ }
+
+ context 'cross project relations deactivated' do
+ before do
+ allow(Setting).to receive(:cross_project_work_package_relations?).and_return(false)
+ end
+
+ it do
+ expect(copy).to be_falsy
+ end
+
+ it do
+ expect(child.reload.project).to eql(source_project)
+ end
+
+ describe 'grandchild' do
+ before do
+ copy
+ end
+
+ it { expect(grandchild.reload.project).to eql(source_project) }
+ end
+ end
+
+ context 'cross project relations activated' do
+ before do
+ allow(Setting).to receive(:cross_project_work_package_relations?).and_return(true)
+ end
+
+ it do
+ expect(copy).to be_truthy
+ end
+
+ it do
+ expect(copy.project).to eql(target_project)
+ end
+
+ describe 'grandchild' do
+ before do
+ copy
+ end
+
+ it { expect(grandchild.reload.project).to eql(target_project) }
+ end
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spec/support/identical_ext.rb b/spec/support/identical_ext.rb
index f59c24a3602..cf2ffb402c6 100644
--- a/spec/support/identical_ext.rb
+++ b/spec/support/identical_ext.rb
@@ -34,9 +34,9 @@ Journal.class_eval do
recreated = o.attributes
original.except!('created_at')
- changed_data.except!('created_on')
+ details.except!('created_on')
recreated.except!('created_at')
- o.changed_data.except!('created_on')
+ o.details.except!('created_on')
original.identical?(recreated)
end
diff --git a/spec/support/repository_helpers.rb b/spec/support/repository_helpers.rb
new file mode 100644
index 00000000000..ab1d4bf01da
--- /dev/null
+++ b/spec/support/repository_helpers.rb
@@ -0,0 +1,85 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+##
+# Create a temporary +vendor+ repository from the stored fixture.
+# Automatically extracts and destroys said repository,
+# however does not provide single example isolation
+# due to performance.
+# As we do not write to the repository, we don't need this kind
+# of isolation.
+def with_filesystem_repository(vendor, command = nil, &block)
+ repo_dir = File.join(Rails.root, 'tmp', 'test', "#{vendor}_repository")
+ fixture = File.join(Rails.root, "spec/fixtures/repositories/#{vendor}_repository.tar.gz")
+
+ before(:all) do
+ ['tar', command].compact.each do |cmd|
+ begin
+ # Avoid `which`, as it's not POSIX
+ Open3.capture2e(cmd, '--version')
+ rescue Errno::ENOENT
+ skip "#{cmd} was not found in PATH. Skipping local repository specs"
+ end
+ end
+
+ # Create repository
+ FileUtils.mkdir_p repo_dir
+ system "tar -xzf #{fixture} -C #{repo_dir}"
+ end
+
+ after(:all) do
+ FileUtils.remove_dir repo_dir
+ end
+
+ block.call(repo_dir)
+end
+
+def with_subversion_repository(&block)
+ with_filesystem_repository('subversion', 'svn', &block)
+end
+
+def with_git_repository(&block)
+ with_filesystem_repository('git', 'git', &block)
+end
+
+##
+# Many specs required any repository to be available,
+# often Filesystem adapter was used, even though
+# no actual filesystem access occured.
+# Instead, we wrap these repository specs in a virtual
+# subversion repository which does not exist on disk.
+def with_virtual_subversion_repository(&block)
+ let(:repository) { FactoryGirl.create(:repository_subversion) }
+
+ before do
+ allow(Setting).to receive(:enabled_scm).and_return(['Subversion'])
+ end
+
+ block.call
+end
diff --git a/spec/support/scm/countable_repository.rb b/spec/support/scm/countable_repository.rb
new file mode 100644
index 00000000000..745b69ee684
--- /dev/null
+++ b/spec/support/scm/countable_repository.rb
@@ -0,0 +1,59 @@
+shared_examples_for 'is a countable repository' do
+ let(:job) { ::Scm::StorageUpdaterJob.new repository }
+ before do
+ allow(::Scm::StorageUpdaterJob).to receive(:new).and_return(job)
+ allow(job).to receive(:repository).and_return(repository)
+ end
+ it 'is countable' do
+ expect(repository.scm).to be_storage_available
+ end
+
+ context 'with patched counter' do
+ let(:count) { 1234 }
+
+ before do
+ allow(repository.scm).to receive(:count_repository!).and_return(count)
+ end
+
+ it 'has has not been counted initially' do
+ expect(repository.required_storage_bytes).to be == 0
+ expect(repository.storage_updated_at).to be_nil
+ end
+
+ it 'counts the repository storage automatically' do
+ expect(repository.required_storage_bytes).to be == 0
+ expect(repository.required_disk_storage).to be == count
+ expect(repository.storage_updated_at).to be >= 1.minute.ago
+ end
+
+ context 'when latest count is outdated' do
+ before do
+ allow(repository).to receive(:storage_updated_at).and_return(24.hours.ago)
+ end
+
+ it 'sucessfuly updates the count to what the adapter returns' do
+ expect(repository.required_storage_bytes).to be == 0
+ expect(repository.required_disk_storage).to be == count
+ end
+ end
+ end
+
+ context 'with real counter' do
+ it 'counts the repository storage automatically' do
+ expect(repository.required_storage_bytes).to be == 0
+ expect(repository.required_disk_storage).to be > 1.kilobyte
+ expect(repository.storage_updated_at).to be >= 1.minute.ago
+ end
+ end
+end
+
+shared_examples_for 'is not a countable repository' do
+ it 'is not countable' do
+ expect(repository.scm).not_to be_storage_available
+ end
+
+ it 'does not return or update the count' do
+ expect(::Scm::StorageUpdaterJob).not_to receive(:new)
+ expect(repository.required_disk_storage).to be_nil
+ end
+end
diff --git a/spec/support/shared/acts_as_watchable.rb b/spec/support/shared/acts_as_watchable.rb
index d3338b7a9fc..ddfae18b09e 100644
--- a/spec/support/shared/acts_as_watchable.rb
+++ b/spec/support/shared/acts_as_watchable.rb
@@ -133,7 +133,7 @@ MESSAGE
subject { model_instance.watcher_recipients }
- it { is_expected.to match_array([watching_user.mail]) }
+ it { is_expected.to match_array([watching_user]) }
context 'when the permission to watch has been removed' do
before do
diff --git a/app/models/notifier.rb b/spec/support/tempdir.rb
similarity index 89%
rename from app/models/notifier.rb
rename to spec/support/tempdir.rb
index d1611b906a6..90a63da3ed0 100644
--- a/app/models/notifier.rb
+++ b/spec/support/tempdir.rb
@@ -26,13 +26,12 @@
#
# See doc/COPYRIGHT.rdoc for more details.
#++
-
-module Notifier
- def self.notify?(event)
- notified_events.include?(event.to_s)
- end
-
- def self.notified_events
- Setting.notified_events.to_a
+shared_context 'with tmpdir' do
+ around do |example|
+ Dir.mktmpdir do |dir|
+ @tmpdir = dir
+ example.run
+ end
end
+ attr_reader :tmpdir
end
diff --git a/spec/workers/mail_notification_jobs/deliver_work_package_notification_job_spec.rb b/spec/workers/mail_notification_jobs/deliver_work_package_notification_job_spec.rb
new file mode 100644
index 00000000000..dd8ba58c742
--- /dev/null
+++ b/spec/workers/mail_notification_jobs/deliver_work_package_notification_job_spec.rb
@@ -0,0 +1,164 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe DeliverWorkPackageNotificationJob, type: :model do
+ let(:project) { FactoryGirl.create(:project) }
+ let(:role) { FactoryGirl.create(:role, permissions: [:view_work_packages]) }
+ let(:recipient) {
+ FactoryGirl.create(:user, member_in_project: project, member_through_role: role)
+ }
+ let(:author) { FactoryGirl.create(:user) }
+ let(:work_package) {
+ FactoryGirl.create(:work_package,
+ project: project,
+ author: author,
+ assigned_to: recipient)
+ }
+ let(:journal) { work_package.journals.first }
+ subject { described_class.new(journal.id, author.id) }
+
+ before do
+ # make sure no actual calls make it into the UserMailer
+ allow(UserMailer).to receive(:work_package_added).and_return(double('mail', deliver: nil))
+ allow(UserMailer).to receive(:work_package_updated).and_return(double('mail', deliver: nil))
+ end
+
+ it 'sends a mail' do
+ expect(UserMailer).to receive(:work_package_added).with(
+ recipient,
+ an_instance_of(Journal::AggregatedJournal),
+ author)
+ subject.perform
+ end
+
+ context 'non-existant journal' do
+ before do
+ journal.destroy
+ end
+
+ it 'sends no mail' do
+ expect(UserMailer).not_to receive(:work_package_added)
+ subject.perform
+ end
+ end
+
+ context 'non-existant author' do
+ before do
+ author.destroy
+ end
+
+ it 'sends a mail' do
+ expect(UserMailer).to receive(:work_package_added)
+ subject.perform
+ end
+
+ it 'uses the deleted user as author' do
+ expect(UserMailer).to receive(:work_package_added)
+ .with(anything, anything, DeletedUser.first)
+
+ subject.perform
+ end
+ end
+
+ context 'outdated journal' do
+ before do
+ # make sure there is a later journal, that supersedes the original one
+ work_package.subject = 'changed subject'
+ work_package.save!
+ end
+
+ it 'raises an error' do
+ expect { subject.perform }.to raise_error('aggregated journal got outdated')
+ end
+ end
+
+ context 'update journal' do
+ let(:journal) { work_package.journals.last }
+
+ before do
+ work_package.add_journal(FactoryGirl.create(:user), 'a comment')
+ work_package.save!
+ end
+
+ it 'sends an update mail' do
+ expect(UserMailer).to receive(:work_package_updated)
+ subject.perform
+ end
+
+ it 'sends a mail for the aggregated journal' do
+ expected = Journal::AggregatedJournal.aggregated_journals(journable: work_package).last
+ expect(UserMailer).to receive(:work_package_updated) do |_recipient, journal, _author|
+ expect(journal.id).to eq expected.id
+ expect(journal.notes_id).to eq expected.notes_id
+
+ double('mail', deliver: nil)
+ end
+ subject.perform
+ end
+ end
+
+ describe 'impersonation' do
+ describe 'the recipient should become the current user during mail creation' do
+ before do
+ expect(UserMailer).to receive(:work_package_added) do
+ expect(User.current).to eql(recipient)
+ double('mail', deliver: nil)
+ end
+ end
+
+ it { subject.perform }
+ end
+
+ context 'for a known current user' do
+ let(:current_user) { FactoryGirl.create(:user) }
+
+ it 'resets to the previous current user after running' do
+ User.current = current_user
+ subject.perform
+ expect(User.current).to eql(current_user)
+ end
+ end
+ end
+
+ describe 'exceptions' do
+ describe 'exceptions should be raised' do
+ before do
+ mail = double('mail')
+ allow(mail).to receive(:deliver).and_raise(SocketError)
+ expect(UserMailer).to receive(:work_package_added).and_return(mail)
+ end
+
+ it 'raises the error' do
+ expect { subject.perform }.to raise_error(SocketError)
+ end
+ end
+ end
+end
diff --git a/spec/workers/mail_notification_jobs/deliver_work_package_updated_spec.rb b/spec/workers/mail_notification_jobs/deliver_work_package_updated_spec.rb
deleted file mode 100644
index bd9e0d162c9..00000000000
--- a/spec/workers/mail_notification_jobs/deliver_work_package_updated_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-require 'workers/mail_notification_jobs/shared_examples'
-
-describe DeliverWorkPackageUpdatedJob, type: :model do
- let(:work_package) do
- FactoryGirl.create(:work_package).tap do |wp|
- wp.subject = mail_subject
- wp.save # create journal
- end
- end
-
- let(:current_user) { FactoryGirl.create :user }
- let(:journal) { work_package.journals.last }
- let(:job) { DeliverWorkPackageUpdatedJob.new user.id, journal.id, current_user.id }
-
- it_behaves_like 'a mail notification job' do
- context 'with journal not found' do
- let(:mail_subject) { 'no journal found! :/' }
-
- before do
- journal.destroy
- end
-
- it_behaves_like 'job cannot find record'
- end
-
- context 'with current user not found' do
- let(:mail_subject) { 'current user not found! :x' }
-
- before do
- current_user.destroy
- end
-
- it_behaves_like 'job cannot find record'
- end
- end
-end
diff --git a/spec/workers/mail_notification_jobs/enqueue_work_package_notification_job_spec.rb b/spec/workers/mail_notification_jobs/enqueue_work_package_notification_job_spec.rb
new file mode 100644
index 00000000000..d8195c9b1dd
--- /dev/null
+++ b/spec/workers/mail_notification_jobs/enqueue_work_package_notification_job_spec.rb
@@ -0,0 +1,216 @@
+#-- encoding: UTF-8
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe EnqueueWorkPackageNotificationJob, type: :model do
+ let(:project) { FactoryGirl.create(:project) }
+ let(:role) { FactoryGirl.create(:role, permissions: [:view_work_packages]) }
+ let(:recipient) {
+ FactoryGirl.create(:user, member_in_project: project, member_through_role: role)
+ }
+ let(:author) { FactoryGirl.create(:user) }
+ let(:work_package) {
+ FactoryGirl.create(:work_package,
+ project: project,
+ author: author,
+ assigned_to: recipient)
+ }
+ let(:journal) { work_package.journals.first }
+ subject { described_class.new(journal.id, author.id) }
+
+ before do
+ # make sure no other calls are made due to WP creation/update
+ allow(OpenProject::Notifications).to receive(:send) # ... and do nothing
+ end
+
+ it 'sends a mail' do
+ expect(Delayed::Job).to receive(:enqueue).with(an_instance_of DeliverWorkPackageNotificationJob)
+ subject.perform
+ end
+
+ context 'non-existant journal' do
+ before do
+ journal.destroy
+ end
+
+ it 'sends no mail' do
+ expect(Delayed::Job).not_to receive(:enqueue)
+ subject.perform
+ end
+ end
+
+ context 'non-existant author' do
+ before do
+ author.destroy
+ end
+
+ it 'sends a mail' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(an_instance_of DeliverWorkPackageNotificationJob)
+ subject.perform
+ end
+ end
+
+ context 'outdated journal' do
+ before do
+ # make sure there is a later journal, that supersedes the original one
+ work_package.subject = 'changed subject'
+ work_package.save!
+ end
+
+ it 'does not send any mails' do
+ expect(Delayed::Job).not_to receive(:enqueue)
+ subject.perform
+ end
+ end
+
+ describe 'mail suppressing aggregation' do
+ # business logic of whether to send or not to send a mail is mainly driven by the presence
+ # of an aggregated journal. However, there is an edge case that could lead to a notification
+ # getting lost. Sadly this is very implementation specific, so I'll describe it:
+ # Journal 1: comment
+ # Journal 2: change (this can also be multiple journals)
+ # Journal 3: comment
+ #
+ # The Job for the first journal will not send any mail, because Journal 2 supersedes it.
+ # However, after adding Journal 3, the aggregation will look like (1), (2, 3). Therefore the
+ # job for Journal 2 will not send a notification. Finally the job for Journal 3 will send a
+ # notification, but only containing the changes of 2 and 3. The comment of journal 1 is lost.
+ # Therefore two things have to happen:
+ # - someone needs to send notifications for the hidden journal
+ # (done by JournalNotificationMailer)
+ # - in case a journal is hidden, its Job is not allowed to enqueue a mail for it
+ # (because someone else will do it on behalf)
+ # This is important since late exec of a Job might cause it to _not_ skip notifications
+
+ before do
+ change = { subject: 'new subject' }
+ note = { notes: 'a comment' }
+
+ expect(work_package.update_by!(author, note)).to be_truthy
+ work_package.reload
+ expect(work_package.update_by!(author, change)).to be_truthy
+ work_package.reload
+ expect(work_package.update_by!(author, note)).to be_truthy
+ end
+
+ let(:timeout) { Setting.journal_aggregation_time_minutes.to_i.minutes }
+ let(:journal_1) { work_package.journals[1] }
+ let(:journal_2) { work_package.journals[2] }
+ let(:journal_3) { work_package.journals[3] }
+
+ context 'all changes happen within the timeout of journal 1' do
+ # The job for 1 will know, that Journal 3 took its addition.
+ # The job for 2 will know, that it has become part of Journal 3.
+ # -> no special behaviour required
+
+ it 'Job 1 sends one mail for journal 1' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(an_instance_of DeliverWorkPackageNotificationJob)
+ .once
+ described_class.new(journal_1.id, author.id).perform
+ end
+
+ it 'Job 2 sends no mails' do
+ expect(Delayed::Job).not_to receive(:enqueue)
+ described_class.new(journal_2.id, author.id).perform
+ end
+
+ it 'Job 3 sends one mail for journal (2,3)' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(an_instance_of DeliverWorkPackageNotificationJob)
+ .once
+ described_class.new(journal_3.id, author.id).perform
+ end
+ end
+
+ context 'journal 3 created after timeout of 1, but inside of timeout for 2' do
+ # Job 1 will not send a mail because it does not know about journal 3
+ # (thinking 2 will take its mail)
+ # The mail of Job 1 is taken over by the JournalNotificationMailer for Journal 3
+ # Even if Job 1 knew of journal 3 (due to late execution), it was not allowed to send a mail
+ # (that would cause a duplicate mail delivery)
+
+ before do
+ journal_2.created_at = journal_1.created_at + (timeout / 2)
+ journal_3.created_at = journal_1.created_at + timeout + 5.seconds
+ journal_2.save!
+ journal_3.save!
+ end
+
+ it 'Job 1 sends no mails' do
+ expect(Delayed::Job).not_to receive(:enqueue)
+ described_class.new(journal_1.id, author.id).perform
+ end
+
+ it 'Job 2 sends no mails' do
+ expect(Delayed::Job).not_to receive(:enqueue)
+ described_class.new(journal_2.id, author.id).perform
+ end
+
+ it 'Job 3 sends one mail for (2,3)' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(an_instance_of DeliverWorkPackageNotificationJob)
+ .once
+ described_class.new(journal_3.id, author.id).perform
+ end
+ end
+
+ context 'journal 3 created after timeout of 1 and 2' do
+ # This is a normal case again, ensuring nobody takes responsiblity when not neccessary.
+
+ before do
+ journal_2.created_at = journal_1.created_at + (timeout / 2)
+ journal_3.created_at = journal_2.created_at + timeout + 5.seconds
+ journal_2.save!
+ journal_3.save!
+ end
+
+ it 'Job 1 sends no mails' do
+ expect(Delayed::Job).not_to receive(:enqueue)
+ described_class.new(journal_1.id, author.id).perform
+ end
+
+ it 'Job 2 sends one mail for journal (1, 2)' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(an_instance_of DeliverWorkPackageNotificationJob)
+ .once
+ described_class.new(journal_2.id, author.id).perform
+ end
+
+ it 'Job 3 sends one mail for journal 3' do
+ expect(Delayed::Job).to receive(:enqueue)
+ .with(an_instance_of DeliverWorkPackageNotificationJob)
+ .once
+ described_class.new(journal_3.id, author.id).perform
+ end
+ end
+ end
+end
diff --git a/spec/workers/mail_notification_jobs/mail_notification_job_spec.rb b/spec/workers/mail_notification_jobs/mail_notification_job_spec.rb
deleted file mode 100644
index 89bf602ec2f..00000000000
--- a/spec/workers/mail_notification_jobs/mail_notification_job_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-describe MailNotificationJob, type: :model do
- class StubNoticationJob < MailNotificationJob
- def initialize(recipient_id, author_id, mail_callback)
- super(recipient_id, author_id)
- @mail_callback = mail_callback
- end
-
- def notification_mail
- @mail_callback.call
- end
- end
-
- let(:recipient) { FactoryGirl.create(:user) }
- let(:author) { FactoryGirl.create(:user) }
- let(:mail) { double('a mail', deliver: nil) }
- let(:mail_callback) { -> { mail } }
- subject { StubNoticationJob.new(recipient.id, author.id, mail_callback) }
-
- describe 'the recipient should become the current user during mail creation' do
- let(:mail_callback) {
- -> {
- expect(User.current).to eql(recipient)
- mail
- }
- }
-
- it { subject.perform }
- end
-
- context 'for a known current user' do
- let(:current_user) { FactoryGirl.create(:user) }
-
- it 'resets to the previous current user after running' do
- User.current = current_user
- subject.perform
- expect(User.current).to eql(current_user)
- end
- end
-end
diff --git a/spec/workers/mail_notification_jobs/shared_examples.rb b/spec/workers/mail_notification_jobs/shared_examples.rb
deleted file mode 100644
index 519667f6b7a..00000000000
--- a/spec/workers/mail_notification_jobs/shared_examples.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-##
-# Shared example expecting #mail_subject and #job to be defined where
-# the former is looked for in the sent email's subject and the latter is
-# the delayed job to be performed.
-# Tests that mail notifications are sent in successful cases,
-# that none are sent but the job finishes nontheless in cases were necessary
-# records are missing (e.g. the user to be notified), and that jobs with any other
-# sort of error fail as expected in order to be rescheduled.
-shared_examples 'a mail notification job' do
- let!(:user) { FactoryGirl.create :user } # user to be notified
-
- context 'with all records found' do
- let(:mail_subject) { 'all records found!' }
-
- before do
- job.perform
- end
-
- it 'sends an email' do
- mail = ActionMailer::Base.deliveries.detect { |m| m.subject.include? mail_subject }
-
- expect(mail).to be_present
- end
- end
-
- shared_examples 'job cannot find record' do
- it 'does not send an email' do
- job.perform
- mail = ActionMailer::Base.deliveries.detect { |m| m.subject.include? mail_subject }
-
- expect(mail).not_to be_present
- end
-
- it 'does not raise an error but fails silently' do
- expect { job.perform }.not_to raise_error
- end
-
- context 'raising exceptions' do
- before { MailNotificationJob.raise_exceptions = true }
- after { MailNotificationJob.raise_exceptions = false }
-
- it 'raises an error' do
- expect { job.perform }.to raise_error(ActiveRecord::RecordNotFound)
- end
- end
- end
-
- context 'with user not found' do
- let(:mail_subject) { 'no user found :(' }
-
- before do
- user.destroy
- end
-
- it_behaves_like 'job cannot find record'
- end
-
- context 'with unexpected error' do
- let(:mail_subject) { "don't care" }
-
- before do
- expect_any_instance_of(Mail::Message).to receive(:deliver).and_raise(SocketError)
- end
-
- it 'raises said error' do
- expect { job.perform }.to raise_error(SocketError)
- end
- end
-end
' + revision.comments + '
' } + end + + describe 'identifier' do + it { is_expected.to have_json_path('identifier') } + it { is_expected.to be_json_eql('1234'.to_json).at_path('identifier') } + end + + describe 'createdAt' do + it_behaves_like 'has UTC ISO 8601 date and time' do + let(:date) { revision.committed_on } + let(:json_path) { 'createdAt' } + end + end + + describe 'authorName' do + it { is_expected.to have_json_path('authorName') } + it { is_expected.to be_json_eql('foo bar '.to_json).at_path('authorName') } + end + end + + context 'with referencing commit message' do + let(:work_package) { FactoryGirl.build_stubbed(:work_package, project: project) } + let(:commit_message) { "Totally references ##{work_package.id}" } + let(:html_reference) { + id = work_package.id + + str = "Totally references " + str << "##{id}" + } + + before do + allow(WorkPackage).to receive(:find_by_id).and_return(work_package) + end + + it_behaves_like 'API V3 formattable', 'message' do + let(:format) { 'plain' } + let(:raw) { revision.comments } + let(:html) { '' + html_reference + '
' } + end + end + + describe 'author' do + context 'with no linked user' do + it_behaves_like 'has no link' do + let(:link) { 'author' } + end + end + + context 'with linked user as author' do + let(:user) { FactoryGirl.build(:user) } + before do + allow(revision).to receive(:user).and_return(user) + end + + it_behaves_like 'has a titled link' do + let(:link) { 'author' } + let(:href) { api_v3_paths.user(user.id) } + let(:title) { user.name } + end + end + end + end +end diff --git a/spec/lib/api/v3/utilities/path_helper_spec.rb b/spec/lib/api/v3/utilities/path_helper_spec.rb index f91c65b5d45..a8f7808ac67 100644 --- a/spec/lib/api/v3/utilities/path_helper_spec.rb +++ b/spec/lib/api/v3/utilities/path_helper_spec.rb @@ -31,8 +31,21 @@ require 'spec_helper' describe ::API::V3::Utilities::PathHelper do let(:helper) { Class.new.tap { |c| c.extend(::API::V3::Utilities::PathHelper) }.api_v3_paths } - shared_examples_for 'api v3 path' do - it { is_expected.to match(/^\/api\/v3/) } + shared_examples_for 'path' do |url| + it 'provides the path' do + is_expected.to match(url) + end + + it 'prepends the sub uri if configured' do + allow(OpenProject::Configuration).to receive(:rails_relative_url_root) + .and_return('/open_project') + + is_expected.to match("/open_project#{url}") + end + end + + shared_examples_for 'api v3 path' do |url| + it_behaves_like 'path', "/api/v3#{url}" end describe '#root' do @@ -44,87 +57,67 @@ describe ::API::V3::Utilities::PathHelper do describe '#activity' do subject { helper.activity 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/activities\/1/) } + it_behaves_like 'api v3 path', '/activities/1' end describe '#attachment' do subject { helper.attachment 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/attachments/1') } + it_behaves_like 'api v3 path', '/attachments/1' end describe '#attachment_download' do subject { helper.attachment_download 1 } - it { is_expected.to eql('/attachments/1') } + it_behaves_like 'path', '/attachments/1' end describe '#attachments_by_work_package' do subject { helper.attachments_by_work_package 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/work_packages/1/attachments') } + it_behaves_like 'api v3 path', '/work_packages/1/attachments' end describe '#available_assignees' do subject { helper.available_assignees 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/projects\/42\/available_assignees/) } + it_behaves_like 'api v3 path', '/projects/42/available_assignees' end describe '#available_responsibles' do subject { helper.available_responsibles 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/projects\/42\/available_responsibles/) } + it_behaves_like 'api v3 path', '/projects/42/available_responsibles' end describe '#available_watchers' do subject { helper.available_watchers 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/42\/available_watchers/) } + it_behaves_like 'api v3 path', '/work_packages/42/available_watchers' end describe '#categories' do subject { helper.categories 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/projects\/42\/categories/) } + it_behaves_like 'api v3 path', '/projects/42/categories' end describe '#category' do subject { helper.category 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/categories\/42/) } + it_behaves_like 'api v3 path', '/categories/42' end describe '#configuration' do subject { helper.configuration } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/configuration') } + it_behaves_like 'api v3 path', '/configuration' end describe '#create_work_package_form' do subject { helper.create_work_package_form 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/projects/42/work_packages/form') } + it_behaves_like 'api v3 path', '/projects/42/work_packages/form' end describe '#render_markup' do @@ -134,9 +127,7 @@ describe ::API::V3::Utilities::PathHelper do allow(Setting).to receive(:text_formatting).and_return('by-the-settings') end - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/render/super_fancy?context=link-ish') } + it_behaves_like 'api v3 path', '/render/super_fancy?context=link-ish' context 'no link given' do subject { helper.render_markup(format: 'super_fancy') } @@ -165,17 +156,13 @@ describe ::API::V3::Utilities::PathHelper do describe '#priorities' do subject { helper.priorities } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/priorities/) } + it_behaves_like 'api v3 path', '/priorities' end describe '#priority' do subject { helper.priority 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/priorities\/1/) } + it_behaves_like 'api v3 path', '/priorities/1' end end @@ -183,59 +170,53 @@ describe ::API::V3::Utilities::PathHelper do describe '#projects' do subject { helper.projects } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/projects/) } + it_behaves_like 'api v3 path', '/projects' end describe '#project' do subject { helper.project 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/projects\/1/) } + it_behaves_like 'api v3 path', '/projects/1' end end describe '#query' do subject { helper.query 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/queries\/1/) } + it_behaves_like 'api v3 path', '/queries/1' end describe '#query_star' do subject { helper.query_star 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/queries/1/star') } + it_behaves_like 'api v3 path', '/queries/1/star' end describe '#query_unstar' do subject { helper.query_unstar 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/queries/1/unstar') } + it_behaves_like 'api v3 path', '/queries/1/unstar' end describe 'relations paths' do describe '#relation' do subject { helper.relation 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/relations/) } + it_behaves_like 'api v3 path', '/relations' end describe '#relation' do subject { helper.relation 1 } - it_behaves_like 'api v3 path' + it_behaves_like 'api v3 path', '/relations/1' + end + end - it { is_expected.to match(/^\/api\/v3\/relations\/1/) } + describe 'revisions paths' do + describe '#revision' do + subject { helper.revision 1 } + + it_behaves_like 'api v3 path', '/revisions/1' end end @@ -243,9 +224,7 @@ describe ::API::V3::Utilities::PathHelper do describe '#work_package_schema' do subject { helper.work_package_schema 1, 2 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/schemas\/1-2/) } + it_behaves_like 'api v3 path', '/work_packages/schemas/1-2' end end @@ -253,17 +232,13 @@ describe ::API::V3::Utilities::PathHelper do describe '#statuses' do subject { helper.statuses } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/statuses/) } + it_behaves_like 'api v3 path', '/statuses' end describe '#status' do subject { helper.status 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/statuses\/1/) } + it_behaves_like 'api v3 path', '/statuses/1' end end @@ -271,9 +246,7 @@ describe ::API::V3::Utilities::PathHelper do describe '#string_object' do subject { helper.string_object 'foo' } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/string_objects?value=foo') } + it_behaves_like 'api v3 path', '/string_objects?value=foo' it 'escapes correctly' do value = 'foo/bar baz' @@ -284,9 +257,7 @@ describe ::API::V3::Utilities::PathHelper do describe '#status' do subject { helper.status 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/statuses\/1/) } + it_behaves_like 'api v3 path', '/statuses/1' end end @@ -294,133 +265,105 @@ describe ::API::V3::Utilities::PathHelper do describe '#types' do subject { helper.types } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/types') } + it_behaves_like 'api v3 path', '/types' end describe '#types_by_project' do subject { helper.types_by_project 12 } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/projects/12/types') } + it_behaves_like 'api v3 path', '/projects/12/types' end describe '#type' do subject { helper.type 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to eql('/api/v3/types/1') } + it_behaves_like 'api v3 path', '/types/1' end end describe '#user' do subject { helper.user 1 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/users\/1/) } + it_behaves_like 'api v3 path', '/users/1' end describe '#version' do subject { helper.version 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/versions\/42/) } + it_behaves_like 'api v3 path', '/versions/42' end describe '#versions_by_project' do subject { helper.versions_by_project 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/projects\/42\/versions/) } + it_behaves_like 'api v3 path', '/projects/42/versions' end describe '#projects_by_version' do subject { helper.projects_by_version 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/versions\/42\/projects/) } + it_behaves_like 'api v3 path', '/versions/42/projects' end describe '#work_packages_by_project' do subject { helper.work_packages_by_project 42 } - it_behaves_like 'api v3 path' - - it { is_expected.to match(/^\/api\/v3\/projects\/42\/work_packages/) } + it_behaves_like 'api v3 path', '/projects/42/work_packages' end describe 'work packages paths' do - shared_examples_for 'api v3 work packages path' do - it { is_expected.to match(/^\/api\/v3\/work_packages/) } - end - describe '#work_packages' do subject { helper.work_packages } - it_behaves_like 'api v3 work packages path' + it_behaves_like 'api v3 path', '/work_packages' end describe '#work_package' do subject { helper.work_package 1 } - it_behaves_like 'api v3 work packages path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/1/) } + it_behaves_like 'api v3 path', '/work_packages/1' end describe '#work_package_activities' do subject { helper.work_package_activities 42 } - it_behaves_like 'api v3 work packages path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/42\/activities/) } + it_behaves_like 'api v3 path', '/work_packages/42/activities' end describe '#work_package_relations' do subject { helper.work_package_relations 42 } - it_behaves_like 'api v3 work packages path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/42\/relations/) } + it_behaves_like 'api v3 path', '/work_packages/42/relations' end describe '#work_package_relation' do subject { helper.work_package_relation 1, 42 } - it_behaves_like 'api v3 work packages path' + it_behaves_like 'api v3 path', '/work_packages/42/relations/1' + end - it { is_expected.to match(/^\/api\/v3\/work_packages\/42\/relations\/1/) } + describe '#work_package_revisions' do + subject { helper.work_package_revisions 42 } + + it_behaves_like 'api v3 path', '/work_packages/42/revisions' end describe '#work_package_form' do subject { helper.work_package_form 1 } - it_behaves_like 'api v3 work packages path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/1\/form/) } + it_behaves_like 'api v3 path', '/work_packages/1/form' end describe '#work_package_watchers' do subject { helper.work_package_watchers 1 } - it_behaves_like 'api v3 work packages path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/1\/watchers/) } + it_behaves_like 'api v3 path', '/work_packages/1/watchers' end describe '#watcher' do subject { helper.watcher 1, 42 } - it_behaves_like 'api v3 work packages path' - - it { is_expected.to match(/^\/api\/v3\/work_packages\/42\/watchers\/1/) } + it_behaves_like 'api v3 path', '/work_packages/42/watchers/1' end end end diff --git a/spec/lib/api/v3/work_packages/work_package_representer_spec.rb b/spec/lib/api/v3/work_packages/work_package_representer_spec.rb index e5a1c1249a1..6c8b07a0f40 100644 --- a/spec/lib/api/v3/work_packages/work_package_representer_spec.rb +++ b/spec/lib/api/v3/work_packages/work_package_representer_spec.rb @@ -87,7 +87,7 @@ describe ::API::V3::WorkPackages::WorkPackageRepresenter do end context 'no start date' do - let(:work_package) { FactoryGirl.build(:work_package, start_date: nil) } + let(:work_package) { FactoryGirl.build(:work_package, id: 42, start_date: nil) } it 'renders as null' do is_expected.to be_json_eql(nil.to_json).at_path('startDate') @@ -102,7 +102,7 @@ describe ::API::V3::WorkPackages::WorkPackageRepresenter do end context 'no due date' do - let(:work_package) { FactoryGirl.build(:work_package, due_date: nil) } + let(:work_package) { FactoryGirl.build(:work_package, id: 42, due_date: nil) } it 'renders as null' do is_expected.to be_json_eql(nil.to_json).at_path('dueDate') @@ -288,7 +288,7 @@ describe ::API::V3::WorkPackages::WorkPackageRepresenter do describe 'assignee' do context 'assignee is set' do let(:work_package) { - FactoryGirl.build(:work_package, assigned_to: FactoryGirl.build(:user)) + FactoryGirl.build(:work_package, id: 42, assigned_to: FactoryGirl.build(:user)) } it_behaves_like 'has a titled link' do @@ -308,7 +308,7 @@ describe ::API::V3::WorkPackages::WorkPackageRepresenter do describe 'responsible' do context 'responsible is set' do let(:work_package) { - FactoryGirl.build(:work_package, responsible: FactoryGirl.build(:user)) + FactoryGirl.build(:work_package, id: 42, responsible: FactoryGirl.build(:user)) } it_behaves_like 'has a titled link' do @@ -325,6 +325,26 @@ describe ::API::V3::WorkPackages::WorkPackageRepresenter do end end + describe 'revisions' do + context 'when the user lacks the view_changesets permission' do + it_behaves_like 'has no link' do + let(:link) { 'revisions' } + end + end + + context 'when the user has the required permission' do + let(:revision_permissions) { [:view_changesets] } + let(:role) { FactoryGirl.create :role, permissions: permissions + revision_permissions } + + it_behaves_like 'has an untitled link' do + let(:link) { 'revisions' } + let(:href) { + api_v3_paths.work_package_revisions(work_package.id) + } + end + end + end + describe 'version' do let(:embedded_path) { '_embedded/version' } let(:href_path) { '_links/version/href' } diff --git a/spec/lib/open_project/scm/adapters/adapter_helper.rb b/spec/lib/open_project/scm/adapters/adapter_helper.rb new file mode 100644 index 00000000000..8b7401ae986 --- /dev/null +++ b/spec/lib/open_project/scm/adapters/adapter_helper.rb @@ -0,0 +1,58 @@ +#-- copyright +# OpenProject is a project management system. +# Copyright (C) 2012-2015 the OpenProject Foundation (OPF) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See doc/COPYRIGHT.rdoc for more details. +#++ + +module Api + module V2 + module Pagination + module PaginationSpecHelper + def paginating_index_action(model, scope) + describe '#index', type: :controller do + let(:params) { + { 'page' => '1', + 'page_limit' => '10', + 'q' => 'blubs', + 'format' => 'json' } + } + + before do + expect(model).to receive(scope) + .with(params['q']) + .and_return(model) + + get :index, params + end + + it 'should be successful' do + expect(response).to be_success + end + end + end + end + end + end +end diff --git a/spec/lib/open_project/scm/adapters/git_adapter_spec.rb b/spec/lib/open_project/scm/adapters/git_adapter_spec.rb new file mode 100644 index 00000000000..42601fe4fd8 --- /dev/null +++ b/spec/lib/open_project/scm/adapters/git_adapter_spec.rb @@ -0,0 +1,485 @@ +#-- encoding: UTF-8 +#-- copyright +# OpenProject is a project management system. +# Copyright (C) 2012-2015 the OpenProject Foundation (OPF) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See doc/COPYRIGHT.rdoc for more details. +#++ + +require 'spec_helper' + +describe OpenProject::Scm::Adapters::Git do + let(:url) { Rails.root.join('/tmp/does/not/exist.git').to_s } + let(:config) { {} } + let(:encoding) { nil } + let(:adapter) { + OpenProject::Scm::Adapters::Git.new( + url, + nil, + nil, + nil, + encoding + ) + } + + before do + allow(adapter.class).to receive(:config).and_return(config) + end + + describe 'client information' do + it 'sets the Git client command' do + expect(adapter.client_command).to eq('git') + end + + context 'with client command from config' do + let(:config) { { client_command: '/usr/local/bin/git' } } + it 'overrides the Git client command from config' do + expect(adapter.client_command).to eq('/usr/local/bin/git') + end + end + + shared_examples 'correct client version' do |git_string, expected_version| + it 'should set the correct client version' do + expect(adapter) + .to receive(:scm_version_from_command_line) + .and_return(git_string) + + expect(adapter.client_version).to eq(expected_version) + expect(adapter.client_available).to be true + expect(adapter.client_version_string).to eq(expected_version.join('.')) + end + end + + it_behaves_like 'correct client version', "git version 1.7.3.4\n", [1, 7, 3, 4] + it_behaves_like 'correct client version', "1.6.1\n1.7\n1.8", [1, 6, 1] + it_behaves_like 'correct client version', "1.6.2\r\n1.8.1\r\n1.9.1", [1, 6, 2] + end + + describe 'invalid repository' do + describe '.check_availability!' do + it 'should not be available' do + expect(Dir.exists?(url)).to be false + expect(adapter).not_to be_available + expect { adapter.check_availability! } + .to raise_error(OpenProject::Scm::Exceptions::ScmUnavailable) + end + + it 'should raise a meaningful error if shell output fails' do + expect(adapter).to receive(:branches) + .and_raise OpenProject::Scm::Exceptions::CommandFailed.new('git', '') + + expect { adapter.check_availability! } + .to raise_error(OpenProject::Scm::Exceptions::ScmUnavailable) + end + end + end + + describe 'empty repository' do + include_context 'with tmpdir' + let(:url) { tmpdir } + + before do + adapter.initialize_bare_git + end + + describe '.check_availability!' do + it 'should be marked empty' do + expect { adapter.check_availability! } + .to raise_error(OpenProject::Scm::Exceptions::ScmEmpty) + end + end + end + + describe 'local repository' do + with_git_repository do |repo_dir| + let(:url) { repo_dir } + + it 'reads the git version' do + expect(adapter.client_version.length).to be >= 3 + end + + it 'is a valid repository' do + expect(Dir.exists?(repo_dir)).to be true + + out, process = Open3.capture2e('git', '--git-dir', repo_dir, 'branch') + expect(process.exitstatus).to eq(0) + expect(out).to include('master') + end + + it 'should be available' do + expect(adapter).to be_available + expect { adapter.check_availability! }.to_not raise_error + end + + it 'should read tags' do + expect(adapter.tags).to match_array(%w[tag00.lightweight tag01.annotated]) + end + + describe '.branches' do + it 'should show the default branch' do + expect(adapter.default_branch).to eq('master') + end + + it 'should read branches' do + branches = %w[latin-1-path-encoding master test-latin-1 test_branch] + expect(adapter.branches).to match_array(branches) + end + end + + describe '.info' do + it 'builds the info object' do + info = adapter.info + expect(info.root_url).to eq(repo_dir) + expect(info.lastrev.identifier).to eq('71e5c1d3dca6304805b143b9d0e6695fb3895ea4') + end + end + + describe '.lastrev' do + let(:felix_hex) { "Felix Sch\xC3\xA4fer" } + + it 'references the last revision for empty path' do + lastrev = adapter.lastrev('', nil) + expect(lastrev.identifier).to eq('71e5c1d3dca6304805b143b9d0e6695fb3895ea4') + end + + it 'references the last revision of the given path' do + lastrev = adapter.lastrev('README', nil) + expect(lastrev.identifier).to eq('4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8') + expect(lastrev.author).to eq('Adam Soltys