Merge pull request #947 from opf/fix/changeset_journals_on_autofetch_4003

[FIX] Changeset journals on autofetch 4003

app/models/changeset.rb

@@ -108,7 +108,7 @@ class Changeset < ActiveRecord::Base
   end
 
   before_create :sanitize_attributes
-  before_create :assign_redmine_user_from_comitter
+  before_create :assign_openproject_user_from_comitter
   after_create :scan_comment_for_work_package_ids
 
   TIMELOG_RE = /
@@ -271,8 +271,9 @@ class Changeset < ActiveRecord::Base
     self.comments  = self.class.normalize_comments(self.comments, repository.repo_log_encoding)
   end
 
-  def assign_redmine_user_from_comitter
+  def assign_openproject_user_from_comitter
     self.user = repository.find_committer_user(self.committer)
+    add_journal(self.user || User.anonymous, self.comments)
   end
 
   # TODO: refactor to a standard helper method

spec/models/changeset_spec.rb

@@ -0,0 +1,92 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2013 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 Changeset do
+  let(:email) { "bob@bobbit.org" }
+  let(:repo) { FactoryGirl.create(:repository) }
+  let(:changeset) { FactoryGirl.build(:changeset,
+                                      repository: repo,
+                                      revision: '1',
+                                      committer: email,
+                                      comments: "Initial commit") }
+
+  before { Setting.stub(:enabled_scm).and_return(['Filesystem']) }
+
+  shared_examples_for 'valid changeset' do
+    it { expect(changeset.revision).to eq('1') }
+
+    it { expect(changeset.committer).to eq(email) }
+
+    it { expect(changeset.comments).to eq("Initial commit") }
+
+    describe 'journal' do
+      let(:journal) { changeset.journals.first }
+
+      it { expect(journal.user).to eq(journal_user) }
+
+      it { expect(journal.notes).to eq(changeset.comments) }
+    end
+  end
+
+  describe 'assign_openproject user' do
+    describe "w/o user" do
+      before { changeset.save! }
+
+      it_behaves_like 'valid changeset' do
+        let(:journal_user) { User.anonymous }
+      end
+    end
+
+    describe "with user is committer" do
+      let!(:committer) { FactoryGirl.create(:user, login: email) }
+
+      before { changeset.save! }
+
+      it_behaves_like 'valid changeset' do
+        let(:journal_user) { committer }
+      end
+    end
+
+    describe "current user is not committer" do
+      let(:current_user) { FactoryGirl.create(:user) }
+      let!(:committer) { FactoryGirl.create(:user, login: email) }
+
+      before do
+        User.stub(:current).and_return current_user
+
+        changeset.save!
+      end
+
+      it_behaves_like 'valid changeset' do
+        let(:journal_user) { committer }
+      end
+    end
+  end
+end