diff --git a/spec/models/activity_observer_spec.rb b/spec/models/activity_observer_spec.rb
deleted file mode 100644
index 0db4a99..0000000
--- a/spec/models/activity_observer_spec.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe ActivityObserver do
-  let(:project)  { Factory :project } 
-
-  def self.it_should_be_valid_event
-    it { @event.should_not be_nil }
-    it { @event.project.should == project }
-  end
-
-  describe "Merge Request created" do 
-    before do
-      MergeRequest.observers.enable :activity_observer do
-        @merge_request = Factory :merge_request, project: project
-        @event = Event.last
-      end
-    end
-
-    it_should_be_valid_event
-    it { @event.action.should == Event::Created }
-    it { @event.target.should == @merge_request }
-  end
-
-  describe "Issue created" do 
-    before do
-      Issue.observers.enable :activity_observer do
-        @issue = Factory :issue, project: project
-        @event = Event.last
-      end
-    end
-
-    it_should_be_valid_event
-    it { @event.action.should == Event::Created }
-    it { @event.target.should == @issue }
-  end
-
-  #describe "Issue commented" do 
-    #before do 
-      #@issue = Factory :issue, project: project
-      #@note = Factory :note, noteable: @issue, project: project
-      #@event = Event.last
-    #end
-
-    #it_should_be_valid_event
-    #it { @event.action.should == Event::Commented }
-    #it { @event.target.should == @note }
-  #end
-end
diff --git a/spec/models/issue_observer_spec.rb b/spec/models/issue_observer_spec.rb
deleted file mode 100644
index c6a405f..0000000
--- a/spec/models/issue_observer_spec.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require 'spec_helper'
-
-describe IssueObserver do
-  let(:some_user) { double(:user, id: 1) }
-  let(:assignee) { double(:user, id: 2) }
-  let(:issue)    { double(:issue, id: 42, assignee: assignee) }
-
-  before(:each) { subject.stub(:current_user).and_return(some_user) }
-
-  subject { IssueObserver.instance }
-
-  describe '#after_create' do
-
-    it 'is called when an issue is created' do
-      subject.should_receive(:after_create)
-
-      Issue.observers.enable :issue_observer do
-        Factory.create(:issue, project: Factory.create(:project))
-      end
-    end
-
-    it 'sends an email to the assignee' do
-      Notify.should_receive(:new_issue_email).with(issue.id).
-        and_return(double(deliver: true))
-
-      subject.after_create(issue)
-    end
-
-    it 'does not send an email to the assignee if assignee created the issue' do
-      subject.stub(:current_user).and_return(assignee)
-      Notify.should_not_receive(:new_issue_email)
-
-      subject.after_create(issue)
-    end
-  end
-
-  context '#after_update' do
-    before(:each) do
-      issue.stub(:is_being_reassigned?).and_return(false)
-      issue.stub(:is_being_closed?).and_return(false)
-      issue.stub(:is_being_reopened?).and_return(false)
-    end
-
-    it 'is called when an issue is changed' do
-      changed = Factory.create(:issue, project: Factory.create(:project))
-      subject.should_receive(:after_update)
-
-      Issue.observers.enable :issue_observer do
-        changed.description = 'I changed'
-        changed.save
-      end
-    end
-
-    context 'a reassigned email' do
-      it 'is sent if the issue is being reassigned' do
-        issue.should_receive(:is_being_reassigned?).and_return(true)
-        subject.should_receive(:send_reassigned_email).with(issue)
-
-        subject.after_update(issue)
-      end
-
-      it 'is not sent if the issue is not being reassigned' do
-        issue.should_receive(:is_being_reassigned?).and_return(false)
-        subject.should_not_receive(:send_reassigned_email)
-
-        subject.after_update(issue)
-      end
-    end
-
-    context 'a status "closed" note' do
-      it 'is created if the issue is being closed' do
-        issue.should_receive(:is_being_closed?).and_return(true)
-        Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed')
-
-        subject.after_update(issue)
-      end
-
-      it 'is not created if the issue is not being closed' do
-        issue.should_receive(:is_being_closed?).and_return(false)
-        Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'closed')
-
-        subject.after_update(issue)
-      end
-    end
-
-    context 'a status "reopened" note' do
-      it 'is created if the issue is being reopened' do
-        issue.should_receive(:is_being_reopened?).and_return(true)
-        Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened')
-
-        subject.after_update(issue)
-      end
-
-      it 'is not created if the issue is not being reopened' do
-        issue.should_receive(:is_being_reopened?).and_return(false)
-        Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'reopened')
-
-        subject.after_update(issue)
-      end
-    end
-  end
-
-  describe '#send_reassigned_email' do
-    let(:previous_assignee) { double(:user, id: 3) }
-
-    before(:each) do
-      issue.stub(:assignee_id).and_return(assignee.id)
-      issue.stub(:assignee_id_was).and_return(previous_assignee.id)
-    end
-
-    def it_sends_a_reassigned_email_to(recipient)
-      Notify.should_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id).
-        and_return(double(deliver: true))
-    end
-
-    def it_does_not_send_a_reassigned_email_to(recipient)
-      Notify.should_not_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id)
-    end
-
-    it 'sends a reassigned email to the previous and current assignees' do
-      it_sends_a_reassigned_email_to assignee.id
-      it_sends_a_reassigned_email_to previous_assignee.id
-
-      subject.send(:send_reassigned_email, issue)
-    end
-
-    context 'does not send an email to the user who made the reassignment' do
-      it 'if the user is the assignee' do
-        subject.stub(:current_user).and_return(assignee)
-        it_sends_a_reassigned_email_to previous_assignee.id
-        it_does_not_send_a_reassigned_email_to assignee.id
-
-        subject.send(:send_reassigned_email, issue)
-      end
-      it 'if the user is the previous assignee' do
-        subject.stub(:current_user).and_return(previous_assignee)
-        it_sends_a_reassigned_email_to assignee.id
-        it_does_not_send_a_reassigned_email_to previous_assignee.id
-
-        subject.send(:send_reassigned_email, issue)
-      end
-    end
-  end
-end
diff --git a/spec/models/user_observer_spec.rb b/spec/models/user_observer_spec.rb
deleted file mode 100644
index 23dac98..0000000
--- a/spec/models/user_observer_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe UserObserver do
-  subject { UserObserver.instance }
-
-  it 'calls #after_create when new users are created' do
-    new_user = Factory.new(:user)
-    subject.should_receive(:after_create).with(new_user)
-
-    User.observers.enable :user_observer do
-      new_user.save
-    end
-  end
-
-  context 'when a new user is created' do
-    let(:user) { double(:user, id: 42, password: 'P@ssword!') }
-    let(:notification) { double :notification }
-
-    it 'sends an email' do
-      notification.should_receive(:deliver)
-      Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
-
-      subject.after_create(user)
-    end
-  end
-end
diff --git a/spec/observers/activity_observer_spec.rb b/spec/observers/activity_observer_spec.rb
new file mode 100644
index 0000000..0db4a99
--- /dev/null
+++ b/spec/observers/activity_observer_spec.rb
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe ActivityObserver do
+  let(:project)  { Factory :project } 
+
+  def self.it_should_be_valid_event
+    it { @event.should_not be_nil }
+    it { @event.project.should == project }
+  end
+
+  describe "Merge Request created" do 
+    before do
+      MergeRequest.observers.enable :activity_observer do
+        @merge_request = Factory :merge_request, project: project
+        @event = Event.last
+      end
+    end
+
+    it_should_be_valid_event
+    it { @event.action.should == Event::Created }
+    it { @event.target.should == @merge_request }
+  end
+
+  describe "Issue created" do 
+    before do
+      Issue.observers.enable :activity_observer do
+        @issue = Factory :issue, project: project
+        @event = Event.last
+      end
+    end
+
+    it_should_be_valid_event
+    it { @event.action.should == Event::Created }
+    it { @event.target.should == @issue }
+  end
+
+  #describe "Issue commented" do 
+    #before do 
+      #@issue = Factory :issue, project: project
+      #@note = Factory :note, noteable: @issue, project: project
+      #@event = Event.last
+    #end
+
+    #it_should_be_valid_event
+    #it { @event.action.should == Event::Commented }
+    #it { @event.target.should == @note }
+  #end
+end
diff --git a/spec/observers/issue_observer_spec.rb b/spec/observers/issue_observer_spec.rb
new file mode 100644
index 0000000..c6a405f
--- /dev/null
+++ b/spec/observers/issue_observer_spec.rb
@@ -0,0 +1,144 @@
+require 'spec_helper'
+
+describe IssueObserver do
+  let(:some_user) { double(:user, id: 1) }
+  let(:assignee) { double(:user, id: 2) }
+  let(:issue)    { double(:issue, id: 42, assignee: assignee) }
+
+  before(:each) { subject.stub(:current_user).and_return(some_user) }
+
+  subject { IssueObserver.instance }
+
+  describe '#after_create' do
+
+    it 'is called when an issue is created' do
+      subject.should_receive(:after_create)
+
+      Issue.observers.enable :issue_observer do
+        Factory.create(:issue, project: Factory.create(:project))
+      end
+    end
+
+    it 'sends an email to the assignee' do
+      Notify.should_receive(:new_issue_email).with(issue.id).
+        and_return(double(deliver: true))
+
+      subject.after_create(issue)
+    end
+
+    it 'does not send an email to the assignee if assignee created the issue' do
+      subject.stub(:current_user).and_return(assignee)
+      Notify.should_not_receive(:new_issue_email)
+
+      subject.after_create(issue)
+    end
+  end
+
+  context '#after_update' do
+    before(:each) do
+      issue.stub(:is_being_reassigned?).and_return(false)
+      issue.stub(:is_being_closed?).and_return(false)
+      issue.stub(:is_being_reopened?).and_return(false)
+    end
+
+    it 'is called when an issue is changed' do
+      changed = Factory.create(:issue, project: Factory.create(:project))
+      subject.should_receive(:after_update)
+
+      Issue.observers.enable :issue_observer do
+        changed.description = 'I changed'
+        changed.save
+      end
+    end
+
+    context 'a reassigned email' do
+      it 'is sent if the issue is being reassigned' do
+        issue.should_receive(:is_being_reassigned?).and_return(true)
+        subject.should_receive(:send_reassigned_email).with(issue)
+
+        subject.after_update(issue)
+      end
+
+      it 'is not sent if the issue is not being reassigned' do
+        issue.should_receive(:is_being_reassigned?).and_return(false)
+        subject.should_not_receive(:send_reassigned_email)
+
+        subject.after_update(issue)
+      end
+    end
+
+    context 'a status "closed" note' do
+      it 'is created if the issue is being closed' do
+        issue.should_receive(:is_being_closed?).and_return(true)
+        Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed')
+
+        subject.after_update(issue)
+      end
+
+      it 'is not created if the issue is not being closed' do
+        issue.should_receive(:is_being_closed?).and_return(false)
+        Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'closed')
+
+        subject.after_update(issue)
+      end
+    end
+
+    context 'a status "reopened" note' do
+      it 'is created if the issue is being reopened' do
+        issue.should_receive(:is_being_reopened?).and_return(true)
+        Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened')
+
+        subject.after_update(issue)
+      end
+
+      it 'is not created if the issue is not being reopened' do
+        issue.should_receive(:is_being_reopened?).and_return(false)
+        Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'reopened')
+
+        subject.after_update(issue)
+      end
+    end
+  end
+
+  describe '#send_reassigned_email' do
+    let(:previous_assignee) { double(:user, id: 3) }
+
+    before(:each) do
+      issue.stub(:assignee_id).and_return(assignee.id)
+      issue.stub(:assignee_id_was).and_return(previous_assignee.id)
+    end
+
+    def it_sends_a_reassigned_email_to(recipient)
+      Notify.should_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id).
+        and_return(double(deliver: true))
+    end
+
+    def it_does_not_send_a_reassigned_email_to(recipient)
+      Notify.should_not_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id)
+    end
+
+    it 'sends a reassigned email to the previous and current assignees' do
+      it_sends_a_reassigned_email_to assignee.id
+      it_sends_a_reassigned_email_to previous_assignee.id
+
+      subject.send(:send_reassigned_email, issue)
+    end
+
+    context 'does not send an email to the user who made the reassignment' do
+      it 'if the user is the assignee' do
+        subject.stub(:current_user).and_return(assignee)
+        it_sends_a_reassigned_email_to previous_assignee.id
+        it_does_not_send_a_reassigned_email_to assignee.id
+
+        subject.send(:send_reassigned_email, issue)
+      end
+      it 'if the user is the previous assignee' do
+        subject.stub(:current_user).and_return(previous_assignee)
+        it_sends_a_reassigned_email_to assignee.id
+        it_does_not_send_a_reassigned_email_to previous_assignee.id
+
+        subject.send(:send_reassigned_email, issue)
+      end
+    end
+  end
+end
diff --git a/spec/observers/user_observer_spec.rb b/spec/observers/user_observer_spec.rb
new file mode 100644
index 0000000..23dac98
--- /dev/null
+++ b/spec/observers/user_observer_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe UserObserver do
+  subject { UserObserver.instance }
+
+  it 'calls #after_create when new users are created' do
+    new_user = Factory.new(:user)
+    subject.should_receive(:after_create).with(new_user)
+
+    User.observers.enable :user_observer do
+      new_user.save
+    end
+  end
+
+  context 'when a new user is created' do
+    let(:user) { double(:user, id: 42, password: 'P@ssword!') }
+    let(:notification) { double :notification }
+
+    it 'sends an email' do
+      notification.should_receive(:deliver)
+      Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
+
+      subject.after_create(user)
+    end
+  end
+end
--
libgit2 0.21.2