Merge pull request #3740 from ulferts/feature/add_author_to_fields

Feature/add author to fields
pull/3745/head
Oliver Günther 9 years ago
commit ec63fba3a7
  1. 5
      frontend/app/work_packages/services/index.js
  2. 4
      frontend/tests/unit/tests/work_packages/services/work-packages-overview-service-test.js
  3. 58
      spec/features/work_package_show_spec.rb
  4. 10
      spec/support/pages/full_work_package.rb

@ -40,7 +40,7 @@ angular.module('openproject.workPackages.services')
}, },
{ {
groupName: 'people', groupName: 'people',
attributes: ['assignee', 'responsible'] attributes: ['author', 'assignee', 'responsible']
}, },
{ {
groupName: 'estimatesAndTime', groupName: 'estimatesAndTime',
@ -53,9 +53,6 @@ angular.module('openproject.workPackages.services')
]) ])
.factory('WorkPackageFieldConfigurationService', .factory('WorkPackageFieldConfigurationService',
require('./work-package-field-configuration-service')) require('./work-package-field-configuration-service'))
.constant('WORK_PACKAGE_REGULAR_EDITABLE_FIELD', [
'assignee', 'responsible', 'status', 'version', 'priority'
])
.service('WorkPackagesOverviewService', [ .service('WorkPackagesOverviewService', [
'WORK_PACKAGE_ATTRIBUTES', 'WORK_PACKAGE_ATTRIBUTES',
require('./work-packages-overview-service') require('./work-packages-overview-service')

@ -74,8 +74,8 @@ describe('WorkPackagesOverviewService', function() {
var attributes = Service.getGroupAttributes(groupName); var attributes = Service.getGroupAttributes(groupName);
expect(attributes).not.to.be.null; expect(attributes).not.to.be.null;
expect(attributes).to.have.length(3); expect(attributes).to.have.length(4);
expect(attributes).to.include.members(['assignee', 'responsible', attribute]); expect(attributes).to.include.members(['author', 'assignee', 'responsible', attribute]);
expect(attributes[1]).to.equal(attribute); expect(attributes[1]).to.equal(attribute);
}); });
}); });

@ -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.
#++
require 'spec_helper'
RSpec.feature 'Work package show page', selenium: true do
let(:user) { FactoryGirl.create(:admin) }
let(:project) { FactoryGirl.create(:project) }
let(:work_package) {
FactoryGirl.build(:work_package,
project: project,
assigned_to: user,
responsible: user)
}
before do
login_as(user)
work_package.save!
end
scenario 'all different angular based work package views', js: true do
wp_page = Pages::FullWorkPackage.new(work_package)
wp_page.visit!
wp_page.expect_attributes Author: work_package.author.name,
Type: work_package.type.name,
Status: work_package.status.name,
Priority: work_package.priority.name,
Assignee: work_package.assigned_to.name,
Responsible: work_package.responsible.name
end
end

@ -52,6 +52,16 @@ module Pages
text: work_package.journals.last.user.name) text: work_package.journals.last.user.name)
end end
def expect_attributes(attribute_expectations)
attribute_expectations.each do |label_name, value|
expect(page).to have_selector('.attributes-key-value--key', text: label_name.to_s)
dl_element = page.find('.attributes-key-value--key', text: label_name.to_s).parent
expect(dl_element).to have_selector('.attributes-key-value--value-container', text: value)
end
end
private private
def container def container

Loading…
Cancel
Save