Merge pull request #1300 from tsigo/spec_reorganize

Spec cleanup/reorganization

Merge pull request #1300 from tsigo/spec_reorganize
Spec cleanup/reorganization
Dmitriy Zaporozhets
2 parents 6ff0652e 580ce4f2
Showing 29 changed files with 784 additions and 746 deletions Show diff stats
app/models/milestone.rb
features/step_definitions/project/projects_steps.rb
features/support/env.rb
spec/api/issues_spec.rb
spec/api/projects_spec.rb
spec/api/users_spec.rb
spec/models/activity_observer_spec.rb
spec/models/issue_observer_spec.rb
spec/models/milestone_spec.rb
spec/models/user_observer_spec.rb
spec/monkeypatch.rb
spec/observers/activity_observer_spec.rb
spec/observers/issue_observer_spec.rb
spec/observers/user_observer_spec.rb
spec/requests/admin/security_spec.rb
spec/requests/api/issues_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/users_spec.rb
spec/requests/security/profile_access_spec.rb
spec/requests/security/project_access_spec.rb
@@ -28,17 +28,9 @@ class Milestone &lt; ActiveRecord::Base
   end
  
   def percent_complete
-    @percent_complete ||= begin
-                            total_i = self.issues.count
-                            closed_i = self.issues.closed.count
-                            if total_i > 0
-                              (closed_i * 100) / total_i
-                            else
-                              100
-                            end
-                          rescue => ex
-                            0
-                          end
+    ((self.issues.closed.count * 100) / self.issues.count).abs
+  rescue ZeroDivisionError
+    100
   end
  
   def expires_at
-include LoginMacros
+include LoginHelpers
  
 Given /^I signin as a user$/ do
   login_as :user
@@ -7,9 +7,9 @@ require &#39;cucumber/rails&#39;
 require 'webmock/cucumber'
 WebMock.allow_net_connect!
  
-require Rails.root.join 'spec/monkeypatch'
 require Rails.root.join 'spec/factories'
-require Rails.root.join 'spec/support/login'
+require Rails.root.join 'spec/support/monkeypatch'
+require Rails.root.join 'spec/support/login_helpers'
 require Rails.root.join 'spec/support/valid_commit'
  
 Capybara.default_selector = :css
@@ -1,71 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::API do
-  let(:user) { Factory :user }
-  let!(:project) { Factory :project, owner: user }
-  let!(:issue) { Factory :issue, author: user, assignee: user, project: project }
-  before { project.add_access(user, :read) }
-
-  describe "GET /issues" do
-    it "should return authentication error" do
-      get "#{api_prefix}/issues"
-      response.status.should == 401
-    end
-
-    describe "authenticated GET /issues" do
-      it "should return an array of issues" do
-        get "#{api_prefix}/issues?private_token=#{user.private_token}"
-        response.status.should == 200
-        json_response.should be_an Array
-        json_response.first['title'].should == issue.title
-      end
-    end
-  end
-
-  describe "GET /projects/:id/issues" do
-    it "should return project issues" do
-      get "#{api_prefix}/projects/#{project.code}/issues?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response.should be_an Array
-      json_response.first['title'].should == issue.title
-    end
-  end
-
-  describe "GET /projects/:id/issues/:issue_id" do
-    it "should return a project issue by id" do
-      get "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response['title'].should == issue.title
-    end
-  end
-
-  describe "POST /projects/:id/issues" do
-    it "should create a new project issue" do
-      post "#{api_prefix}/projects/#{project.code}/issues?private_token=#{user.private_token}",
-        title: 'new issue', labels: 'label, label2'
-      response.status.should == 201
-      json_response['title'].should == 'new issue'
-      json_response['description'].should be_nil
-      json_response['labels'].should == ['label', 'label2']
-    end
-  end
-
-  describe "PUT /projects/:id/issues/:issue_id" do
-    it "should update a project issue" do
-      put "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}",
-        title: 'updated title', labels: 'label2', closed: 1
-      response.status.should == 200
-      json_response['title'].should == 'updated title'
-      json_response['labels'].should == ['label2']
-      json_response['closed'].should be_true
-    end
-  end
-
-  describe "DELETE /projects/:id/issues/:issue_id" do
-    it "should delete a project issue" do
-      expect {
-        delete "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}"
-      }.to change { Issue.count }.by(-1)
-    end
-  end
-end
@@ -1,136 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::API do
-  let(:user) { Factory :user }
-  let!(:project) { Factory :project, owner: user }
-  let!(:snippet) { Factory :snippet, author: user, project: project, title: 'example' }
-  before { project.add_access(user, :read) }
-
-  describe "GET /projects" do
-    it "should return authentication error" do
-      get "#{api_prefix}/projects"
-      response.status.should == 401
-    end
-
-    describe "authenticated GET /projects" do
-      it "should return an array of projects" do
-        get "#{api_prefix}/projects?private_token=#{user.private_token}"
-        response.status.should == 200
-        json_response.should be_an Array
-        json_response.first['name'].should == project.name
-        json_response.first['owner']['email'].should == user.email
-      end
-    end
-  end
-
-  describe "GET /projects/:id" do
-    it "should return a project by id" do
-      get "#{api_prefix}/projects/#{project.id}?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response['name'].should == project.name
-      json_response['owner']['email'].should == user.email
-    end
-
-    it "should return a project by code name" do
-      get "#{api_prefix}/projects/#{project.code}?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response['name'].should == project.name
-    end
-
-    it "should return a 404 error if not found" do
-      get "#{api_prefix}/projects/42?private_token=#{user.private_token}"
-      response.status.should == 404
-      json_response['message'].should == '404 Not found'
-    end
-  end
-
-  describe "GET /projects/:id/repository/branches" do
-    it "should return an array of project branches" do
-      get "#{api_prefix}/projects/#{project.code}/repository/branches?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response.should be_an Array
-      json_response.first['name'].should == project.repo.heads.sort_by(&:name).first.name
-    end
-  end
-
-  describe "GET /projects/:id/repository/branches/:branch" do
-    it "should return the branch information for a single branch" do
-      get "#{api_prefix}/projects/#{project.code}/repository/branches/new_design?private_token=#{user.private_token}"
-      response.status.should == 200
-
-      json_response['name'].should == 'new_design'
-      json_response['commit']['id'].should == '621491c677087aa243f165eab467bfdfbee00be1'
-    end
-  end
-
-  describe "GET /projects/:id/repository/tags" do
-    it "should return an array of project tags" do
-      get "#{api_prefix}/projects/#{project.code}/repository/tags?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response.should be_an Array
-      json_response.first['name'].should == project.repo.tags.sort_by(&:name).reverse.first.name
-    end
-  end
-
-  describe "GET /projects/:id/snippets/:snippet_id" do
-    it "should return a project snippet" do
-      get "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response['title'].should == snippet.title
-    end
-  end
-
-  describe "POST /projects/:id/snippets" do
-    it "should create a new project snippet" do
-      post "#{api_prefix}/projects/#{project.code}/snippets?private_token=#{user.private_token}",
-        title: 'api test', file_name: 'sample.rb', code: 'test'
-      response.status.should == 201
-      json_response['title'].should == 'api test'
-    end
-  end
-
-  describe "PUT /projects/:id/snippets" do
-    it "should update an existing project snippet" do
-      put "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}",
-        code: 'updated code'
-      response.status.should == 200
-      json_response['title'].should == 'example'
-      snippet.reload.content.should == 'updated code'
-    end
-  end
-
-  describe "DELETE /projects/:id/snippets/:snippet_id" do
-    it "should delete existing project snippet" do
-      expect {
-        delete "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
-      }.to change { Snippet.count }.by(-1)
-    end
-  end
-
-  describe "GET /projects/:id/snippets/:snippet_id/raw" do
-    it "should get a raw project snippet" do
-      get "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}/raw?private_token=#{user.private_token}"
-      response.status.should == 200
-    end
-  end
-
-  describe "GET /projects/:id/:sha/blob" do
-    it "should get the raw file contents" do
-      get "#{api_prefix}/projects/#{project.code}/repository/commits/master/blob?filepath=README.md&private_token=#{user.private_token}"
-      
-      response.status.should == 200
-    end
-
-    it "should return 404 for invalid branch_name" do
-      get "#{api_prefix}/projects/#{project.code}/repository/commits/invalid_branch_name/blob?filepath=README.md&private_token=#{user.private_token}"
-      
-      response.status.should == 404
-    end
-
-    it "should return 404 for invalid file" do
-      get "#{api_prefix}/projects/#{project.code}/repository/commits/master/blob?filepath=README.invalid&private_token=#{user.private_token}"
-      
-      response.status.should == 404
-    end
-  end
-end
@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::API do
-  let(:user) { Factory :user }
-
-  describe "GET /users" do
-    it "should return authentication error" do
-      get "#{api_prefix}/users"
-      response.status.should == 401
-    end
-
-    describe "authenticated GET /users" do
-      it "should return an array of users" do
-        get "#{api_prefix}/users?private_token=#{user.private_token}"
-        response.status.should == 200
-        json_response.should be_an Array
-        json_response.first['email'].should == user.email
-      end
-    end
-  end
-
-  describe "GET /users/:id" do
-    it "should return a user by id" do
-      get "#{api_prefix}/users/#{user.id}?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response['email'].should == user.email
-    end
-  end
-
-  describe "GET /user" do
-    it "should return current user" do
-      get "#{api_prefix}/user?private_token=#{user.private_token}"
-      response.status.should == 200
-      json_response['email'].should == user.email
-    end
-  end
-end
@@ -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
@@ -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
@@ -31,24 +31,33 @@ describe Milestone do
  
   it { milestone.should be_valid }
  
-  describe "Issues" do 
-    before do 
+  describe "#percent_complete" do
+    it "should not count open issues" do
       milestone.issues << issue
+      milestone.percent_complete.should == 0
     end
  
-    it { milestone.percent_complete.should == 0 }
+    it "should count closed issues" do
+      issue.update_attributes(closed: true)
+      milestone.issues << issue
+      milestone.percent_complete.should == 100
+    end
  
-    it do 
-      issue.update_attributes closed: true
+    it "should recover from dividing by zero" do
+      milestone.issues.should_receive(:count).and_return(0)
       milestone.percent_complete.should == 100
     end
   end
  
-  describe :expires_at do 
-    before do 
-      milestone.update_attributes due_date: Date.today + 1.day
+  describe "#expires_at" do
+    it "should be nil when due_date is unset" do
+      milestone.update_attributes(due_date: nil)
+      milestone.expires_at.should be_nil
     end
  
-    it { milestone.expires_at.should_not be_nil }
+    it "should not be nil when due_date is set" do
+      milestone.update_attributes(due_date: Date.tomorrow)
+      milestone.expires_at.should be_present
+    end
   end
 end
@@ -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
@@ -1,51 +0,0 @@
-# Stubbing Project <-> git host path
-# create project using Factory only
-class Project
-  def update_repository
-    true
-  end
-
-  def destroy_repository
-    true
-  end
-
-  def path_to_repo
-    File.join(Rails.root, "tmp", "tests", path)
-  end
-
-  def satellite
-    @satellite ||= FakeSatellite.new
-  end
-end
-
-class Key
-  def update_repository
-    true
-  end
-
-  def repository_delete_key
-    true
-  end
-end
-
-class UsersProject
-  def update_repository
-    true
-  end
-end
-
-class FakeSatellite
-  def exists?
-    true
-  end
-
-  def create
-    true
-  end
-end
-
-class ProtectedBranch
-  def update_repository
-    true
-  end
-end
@@ -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
@@ -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
@@ -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
@@ -2,20 +2,26 @@ require &#39;spec_helper&#39;
  
 describe "Admin::Projects" do
   describe "GET /admin/projects" do
-    it { admin_projects_path.should be_allowed_for :admin }
-    it { admin_projects_path.should be_denied_for :user }
-    it { admin_projects_path.should be_denied_for :visitor }
+    subject { admin_projects_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
   end
  
   describe "GET /admin/users" do
-    it { admin_users_path.should be_allowed_for :admin }
-    it { admin_users_path.should be_denied_for :user }
-    it { admin_users_path.should be_denied_for :visitor }
+    subject { admin_users_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
   end
  
   describe "GET /admin/hooks" do
-    it { admin_hooks_path.should be_allowed_for :admin }
-    it { admin_hooks_path.should be_denied_for :user }
-    it { admin_hooks_path.should be_denied_for :visitor }
+    subject { admin_hooks_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
   end
 end
@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe Gitlab::API do
+  include ApiHelpers
+
+  let(:user) { Factory :user }
+  let!(:project) { Factory :project, owner: user }
+  let!(:issue) { Factory :issue, author: user, assignee: user, project: project }
+  before { project.add_access(user, :read) }
+
+  describe "GET /issues" do
+    it "should return authentication error" do
+      get api("/issues")
+      response.status.should == 401
+    end
+
+    describe "authenticated GET /issues" do
+      it "should return an array of issues" do
+        get api("/issues", user)
+        response.status.should == 200
+        json_response.should be_an Array
+        json_response.first['title'].should == issue.title
+      end
+    end
+  end
+
+  describe "GET /projects/:id/issues" do
+    it "should return project issues" do
+      get api("/projects/#{project.code}/issues", user)
+      response.status.should == 200
+      json_response.should be_an Array
+      json_response.first['title'].should == issue.title
+    end
+  end
+
+  describe "GET /projects/:id/issues/:issue_id" do
+    it "should return a project issue by id" do
+      get api("/projects/#{project.code}/issues/#{issue.id}", user)
+      response.status.should == 200
+      json_response['title'].should == issue.title
+    end
+  end
+
+  describe "POST /projects/:id/issues" do
+    it "should create a new project issue" do
+      post api("/projects/#{project.code}/issues", user),
+        title: 'new issue', labels: 'label, label2'
+      response.status.should == 201
+      json_response['title'].should == 'new issue'
+      json_response['description'].should be_nil
+      json_response['labels'].should == ['label', 'label2']
+    end
+  end
+
+  describe "PUT /projects/:id/issues/:issue_id" do
+    it "should update a project issue" do
+      put api("/projects/#{project.code}/issues/#{issue.id}", user),
+        title: 'updated title', labels: 'label2', closed: 1
+      response.status.should == 200
+      json_response['title'].should == 'updated title'
+      json_response['labels'].should == ['label2']
+      json_response['closed'].should be_true
+    end
+  end
+
+  describe "DELETE /projects/:id/issues/:issue_id" do
+    it "should delete a project issue" do
+      expect {
+        delete api("/projects/#{project.code}/issues/#{issue.id}", user)
+      }.to change { Issue.count }.by(-1)
+    end
+  end
+end
@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe Gitlab::API do
+  include ApiHelpers
+
+  let(:user) { Factory :user }
+  let!(:project) { Factory :project, owner: user }
+  let!(:snippet) { Factory :snippet, author: user, project: project, title: 'example' }
+  before { project.add_access(user, :read) }
+
+  describe "GET /projects" do
+    it "should return authentication error" do
+      get api("/projects")
+      response.status.should == 401
+    end
+
+    describe "authenticated GET /projects" do
+      it "should return an array of projects" do
+        get api("/projects", user)
+        response.status.should == 200
+        json_response.should be_an Array
+        json_response.first['name'].should == project.name
+        json_response.first['owner']['email'].should == user.email
+      end
+    end
+  end
+
+  describe "GET /projects/:id" do
+    it "should return a project by id" do
+      get api("/projects/#{project.id}", user)
+      response.status.should == 200
+      json_response['name'].should == project.name
+      json_response['owner']['email'].should == user.email
+    end
+
+    it "should return a project by code name" do
+      get api("/projects/#{project.code}", user)
+      response.status.should == 200
+      json_response['name'].should == project.name
+    end
+
+    it "should return a 404 error if not found" do
+      get api("/projects/42", user)
+      response.status.should == 404
+      json_response['message'].should == '404 Not found'
+    end
+  end
+
+  describe "GET /projects/:id/repository/branches" do
+    it "should return an array of project branches" do
+      get api("/projects/#{project.code}/repository/branches", user)
+      response.status.should == 200
+      json_response.should be_an Array
+      json_response.first['name'].should == project.repo.heads.sort_by(&:name).first.name
+    end
+  end
+
+  describe "GET /projects/:id/repository/branches/:branch" do
+    it "should return the branch information for a single branch" do
+      get api("/projects/#{project.code}/repository/branches/new_design", user)
+      response.status.should == 200
+
+      json_response['name'].should == 'new_design'
+      json_response['commit']['id'].should == '621491c677087aa243f165eab467bfdfbee00be1'
+    end
+  end
+
+  describe "GET /projects/:id/repository/tags" do
+    it "should return an array of project tags" do
+      get api("/projects/#{project.code}/repository/tags", user)
+      response.status.should == 200
+      json_response.should be_an Array
+      json_response.first['name'].should == project.repo.tags.sort_by(&:name).reverse.first.name
+    end
+  end
+
+  describe "GET /projects/:id/snippets/:snippet_id" do
+    it "should return a project snippet" do
+      get api("/projects/#{project.code}/snippets/#{snippet.id}", user)
+      response.status.should == 200
+      json_response['title'].should == snippet.title
+    end
+  end
+
+  describe "POST /projects/:id/snippets" do
+    it "should create a new project snippet" do
+      post api("/projects/#{project.code}/snippets", user),
+        title: 'api test', file_name: 'sample.rb', code: 'test'
+      response.status.should == 201
+      json_response['title'].should == 'api test'
+    end
+  end
+
+  describe "PUT /projects/:id/snippets" do
+    it "should update an existing project snippet" do
+      put api("/projects/#{project.code}/snippets/#{snippet.id}", user),
+        code: 'updated code'
+      response.status.should == 200
+      json_response['title'].should == 'example'
+      snippet.reload.content.should == 'updated code'
+    end
+  end
+
+  describe "DELETE /projects/:id/snippets/:snippet_id" do
+    it "should delete existing project snippet" do
+      expect {
+        delete api("/projects/#{project.code}/snippets/#{snippet.id}", user)
+      }.to change { Snippet.count }.by(-1)
+    end
+  end
+
+  describe "GET /projects/:id/snippets/:snippet_id/raw" do
+    it "should get a raw project snippet" do
+      get api("/projects/#{project.code}/snippets/#{snippet.id}/raw", user)
+      response.status.should == 200
+    end
+  end
+
+  describe "GET /projects/:id/:sha/blob" do
+    it "should get the raw file contents" do
+      get api("/projects/#{project.code}/repository/commits/master/blob?filepath=README.md", user)
+      response.status.should == 200
+    end
+
+    it "should return 404 for invalid branch_name" do
+      get api("/projects/#{project.code}/repository/commits/invalid_branch_name/blob?filepath=README.md", user)
+      response.status.should == 404
+    end
+
+    it "should return 404 for invalid file" do
+      get api("/projects/#{project.code}/repository/commits/master/blob?filepath=README.invalid", user)
+      response.status.should == 404
+    end
+  end
+end
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Gitlab::API do
+  include ApiHelpers
+
+  let(:user) { Factory :user }
+
+  describe "GET /users" do
+    it "should return authentication error" do
+      get api("/users")
+      response.status.should == 401
+    end
+
+    describe "authenticated GET /users" do
+      it "should return an array of users" do
+        get api("/users", user)
+        response.status.should == 200
+        json_response.should be_an Array
+        json_response.first['email'].should == user.email
+      end
+    end
+  end
+
+  describe "GET /users/:id" do
+    it "should return a user by id" do
+      get api("/users/#{user.id}", user)
+      response.status.should == 200
+      json_response['email'].should == user.email
+    end
+  end
+
+  describe "GET /user" do
+    it "should return current user" do
+      get api("/user", user)
+      response.status.should == 200
+      json_response['email'].should == user.email
+    end
+  end
+end
@@ -11,24 +11,30 @@ describe &quot;Users Security&quot; do
     end
  
     describe "GET /keys" do
-      it { keys_path.should be_allowed_for @u1 }
-      it { keys_path.should be_allowed_for :admin }
-      it { keys_path.should be_allowed_for :user }
-      it { keys_path.should be_denied_for :visitor }
+      subject { keys_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /profile" do
-      it { profile_path.should be_allowed_for @u1 }
-      it { profile_path.should be_allowed_for :admin }
-      it { profile_path.should be_allowed_for :user }
-      it { profile_path.should be_denied_for :visitor }
+      subject { profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /profile/password" do
-      it { profile_password_path.should be_allowed_for @u1 }
-      it { profile_password_path.should be_allowed_for :admin }
-      it { profile_password_path.should be_allowed_for :user }
-      it { profile_password_path.should be_denied_for :visitor }
+      subject { profile_password_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
     end
   end
 end
@@ -26,64 +26,76 @@ describe &quot;Application access&quot; do
     end
  
     describe "GET /project_code" do
-      it { project_path(@project).should be_allowed_for @u1 }
-      it { project_path(@project).should be_allowed_for @u3 }
-      it { project_path(@project).should be_denied_for :admin }
-      it { project_path(@project).should be_denied_for @u2 }
-      it { project_path(@project).should be_denied_for :user }
-      it { project_path(@project).should be_denied_for :visitor }
+      subject { project_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/master/tree" do
-      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u1 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_allowed_for @u3 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :admin }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for @u2 }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :user }
-      it { tree_project_ref_path(@project, @project.root_ref).should be_denied_for :visitor }
+      subject { tree_project_ref_path(@project, @project.root_ref) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/commits" do
-      it { project_commits_path(@project).should be_allowed_for @u1 }
-      it { project_commits_path(@project).should be_allowed_for @u3 }
-      it { project_commits_path(@project).should be_denied_for :admin }
-      it { project_commits_path(@project).should be_denied_for @u2 }
-      it { project_commits_path(@project).should be_denied_for :user }
-      it { project_commits_path(@project).should be_denied_for :visitor }
+      subject { project_commits_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/commit" do
-      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u1 }
-      it { project_commit_path(@project, @project.commit.id).should be_allowed_for @u3 }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :admin }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for @u2 }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :user }
-      it { project_commit_path(@project, @project.commit.id).should be_denied_for :visitor }
+      subject { project_commit_path(@project, @project.commit.id) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/team" do
-      it { team_project_path(@project).should be_allowed_for @u1 }
-      it { team_project_path(@project).should be_allowed_for @u3 }
-      it { team_project_path(@project).should be_denied_for :admin }
-      it { team_project_path(@project).should be_denied_for @u2 }
-      it { team_project_path(@project).should be_denied_for :user }
-      it { team_project_path(@project).should be_denied_for :visitor }
+      subject { team_project_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/wall" do
-      it { wall_project_path(@project).should be_allowed_for @u1 }
-      it { wall_project_path(@project).should be_allowed_for @u3 }
-      it { wall_project_path(@project).should be_denied_for :admin }
-      it { wall_project_path(@project).should be_denied_for @u2 }
-      it { wall_project_path(@project).should be_denied_for :user }
-      it { wall_project_path(@project).should be_denied_for :visitor }
+      subject { wall_project_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/blob" do
       before do
-        @commit = @project.commit
-        @path = @commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
-        @blob_path = blob_project_ref_path(@project, @commit.id, path: @path)
+        commit = @project.commit
+        path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
+        @blob_path = blob_project_ref_path(@project, commit.id, path: path)
       end
  
       it { @blob_path.should be_allowed_for @u1 }
@@ -95,93 +107,113 @@ describe &quot;Application access&quot; do
     end
  
     describe "GET /project_code/edit" do
-      it { edit_project_path(@project).should be_allowed_for @u1 }
-      it { edit_project_path(@project).should be_denied_for @u3 }
-      it { edit_project_path(@project).should be_denied_for :admin }
-      it { edit_project_path(@project).should be_denied_for @u2 }
-      it { edit_project_path(@project).should be_denied_for :user }
-      it { edit_project_path(@project).should be_denied_for :visitor }
+      subject { edit_project_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_denied_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/deploy_keys" do
-      it { project_deploy_keys_path(@project).should be_allowed_for @u1 }
-      it { project_deploy_keys_path(@project).should be_denied_for @u3 }
-      it { project_deploy_keys_path(@project).should be_denied_for :admin }
-      it { project_deploy_keys_path(@project).should be_denied_for @u2 }
-      it { project_deploy_keys_path(@project).should be_denied_for :user }
-      it { project_deploy_keys_path(@project).should be_denied_for :visitor }
+      subject { project_deploy_keys_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_denied_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/issues" do
-      it { project_issues_path(@project).should be_allowed_for @u1 }
-      it { project_issues_path(@project).should be_allowed_for @u3 }
-      it { project_issues_path(@project).should be_denied_for :admin }
-      it { project_issues_path(@project).should be_denied_for @u2 }
-      it { project_issues_path(@project).should be_denied_for :user }
-      it { project_issues_path(@project).should be_denied_for :visitor }
+      subject { project_issues_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/snippets" do
-      it { project_snippets_path(@project).should be_allowed_for @u1 }
-      it { project_snippets_path(@project).should be_allowed_for @u3 }
-      it { project_snippets_path(@project).should be_denied_for :admin }
-      it { project_snippets_path(@project).should be_denied_for @u2 }
-      it { project_snippets_path(@project).should be_denied_for :user }
-      it { project_snippets_path(@project).should be_denied_for :visitor }
+      subject { project_snippets_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/merge_requests" do
-      it { project_merge_requests_path(@project).should be_allowed_for @u1 }
-      it { project_merge_requests_path(@project).should be_allowed_for @u3 }
-      it { project_merge_requests_path(@project).should be_denied_for :admin }
-      it { project_merge_requests_path(@project).should be_denied_for @u2 }
-      it { project_merge_requests_path(@project).should be_denied_for :user }
-      it { project_merge_requests_path(@project).should be_denied_for :visitor }
+      subject { project_merge_requests_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/repository" do
-      it { project_repository_path(@project).should be_allowed_for @u1 }
-      it { project_repository_path(@project).should be_allowed_for @u3 }
-      it { project_repository_path(@project).should be_denied_for :admin }
-      it { project_repository_path(@project).should be_denied_for @u2 }
-      it { project_repository_path(@project).should be_denied_for :user }
-      it { project_repository_path(@project).should be_denied_for :visitor }
+      subject { project_repository_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/repository/branches" do
-      it { branches_project_repository_path(@project).should be_allowed_for @u1 }
-      it { branches_project_repository_path(@project).should be_allowed_for @u3 }
-      it { branches_project_repository_path(@project).should be_denied_for :admin }
-      it { branches_project_repository_path(@project).should be_denied_for @u2 }
-      it { branches_project_repository_path(@project).should be_denied_for :user }
-      it { branches_project_repository_path(@project).should be_denied_for :visitor }
+      subject { branches_project_repository_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/repository/tags" do
-      it { tags_project_repository_path(@project).should be_allowed_for @u1 }
-      it { tags_project_repository_path(@project).should be_allowed_for @u3 }
-      it { tags_project_repository_path(@project).should be_denied_for :admin }
-      it { tags_project_repository_path(@project).should be_denied_for @u2 }
-      it { tags_project_repository_path(@project).should be_denied_for :user }
-      it { tags_project_repository_path(@project).should be_denied_for :visitor }
+      subject { tags_project_repository_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/hooks" do
-      it { project_hooks_path(@project).should be_allowed_for @u1 }
-      it { project_hooks_path(@project).should be_allowed_for @u3 }
-      it { project_hooks_path(@project).should be_denied_for :admin }
-      it { project_hooks_path(@project).should be_denied_for @u2 }
-      it { project_hooks_path(@project).should be_denied_for :user }
-      it { project_hooks_path(@project).should be_denied_for :visitor }
+      subject { project_hooks_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
  
     describe "GET /project_code/files" do
-      it { files_project_path(@project).should be_allowed_for @u1 }
-      it { files_project_path(@project).should be_allowed_for @u3 }
-      it { files_project_path(@project).should be_denied_for :admin }
-      it { files_project_path(@project).should be_denied_for @u2 }
-      it { files_project_path(@project).should be_denied_for :user }
-      it { files_project_path(@project).should be_denied_for :visitor }
+      subject { files_project_path(@project) }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for @u3 }
+      it { should be_denied_for :admin }
+      it { should be_denied_for @u2 }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
     end
   end
 end
@@ -9,10 +9,8 @@ require File.expand_path(&quot;../../config/environment&quot;, __FILE__)
 require 'rspec/rails'
 require 'capybara/rails'
 require 'capybara/rspec'
-require 'capybara/dsl'
 require 'webmock/rspec'
 require 'factories'
-require 'monkeypatch'
 require 'email_spec'
 require 'headless'
  
@@ -23,10 +21,12 @@ Dir[Rails.root.join(&quot;spec/support/**/*.rb&quot;)].each {|f| require f}
 # Use capybara-webkit
 Capybara.javascript_driver = :webkit
  
+WebMock.disable_net_connect!(allow_localhost: true)
+
 RSpec.configure do |config|
   config.mock_with :rspec
  
-  config.include LoginMacros
+  config.include LoginHelpers, type: :request
  
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -38,35 +38,9 @@ RSpec.configure do |config|
     headless.start
   end
  
-  config.before :each, type: :integration do
-    DeviseSessionMock.disable
-  end
-
   config.before do
-    if example.metadata[:js]
-      DatabaseCleaner.strategy = :truncation
-      Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
-
-    DatabaseCleaner.start
-
-    WebMock.disable_net_connect!(allow_localhost: true)
-
     # !!! Observers disabled by default in tests
-    #
-    #   Use next code to enable observers
-    #   before(:each) { ActiveRecord::Base.observers.enable(:all) }
-    #
-    ActiveRecord::Base.observers.disable :all
-  end
-
-  config.after do
-    DatabaseCleaner.clean
+    ActiveRecord::Base.observers.disable(:all)
+    # ActiveRecord::Base.observers.enable(:all)
   end
-
-  config.include RSpec::Rails::RequestExampleGroup, type: :request, example_group: {
-    file_path: /spec\/api/
-  }
 end
@@ -1,7 +0,0 @@
-def api_prefix
-  "/api/#{Gitlab::API::VERSION}"
-end
-
-def json_response
-  JSON.parse(response.body)
-end
@@ -0,0 +1,34 @@
+module ApiHelpers
+  # Public: Prepend a request path with the path to the API
+  #
+  # path - Path to append
+  # user - User object - If provided, automatically appends private_token query
+  #          string for authenticated requests
+  #
+  # Examples
+  #
+  #   >> api('/issues')
+  #   => "/api/v2/issues"
+  #
+  #   >> api('/issues', User.last)
+  #   => "/api/v2/issues?private_token=..."
+  #
+  #   >> api('/issues?foo=bar', User.last)
+  #   => "/api/v2/issues?foo=bar&private_token=..."
+  #
+  # Returns the relative path to the requested API resource
+  def api(path, user = nil)
+    "/api/#{Gitlab::API::VERSION}#{path}" +
+
+      # Normalize query string
+      (path.index('?') ? '' : '?') +
+
+      # Append private_token if given a User object
+      (user.respond_to?(:private_token) ?
+        "&private_token=#{user.private_token}" : "")
+  end
+
+  def json_response
+    JSON.parse(response.body)
+  end
+end
@@ -0,0 +1,18 @@
+require 'database_cleaner'
+
+RSpec.configure do |config|
+  config.before do
+    if example.metadata[:js]
+      DatabaseCleaner.strategy = :truncation
+      Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true
+    else
+      DatabaseCleaner.strategy = :transaction
+    end
+
+    DatabaseCleaner.start
+  end
+
+  config.after do
+    DatabaseCleaner.clean
+  end
+end
@@ -1,6 +0,0 @@
-module JsPatch
-  def confirm_js_popup
-    page.evaluate_script("window.alert = function(msg) { return true; }")
-    page.evaluate_script("window.confirm = function(msg) { return true; }")
-  end
-end
@@ -1,30 +0,0 @@
-module LoginMacros
-  def login_as role
-    @user = User.create(email: "user#{User.count}@mail.com",
-                        name: "John Smith",
-                        password: "123456",
-                        password_confirmation: "123456",
-                        skype: 'user_skype')
-
-    if role == :admin
-      @user.admin = true
-      @user.save!
-    end
-
-    visit new_user_session_path
-    fill_in "user_email", with: @user.email
-    fill_in "user_password", with: "123456"
-    click_button "Sign in"
-  end
-
-  def login_with(user)
-    visit new_user_session_path
-    fill_in "user_email", with: user.email
-    fill_in "user_password", with: "123456"
-    click_button "Sign in"
-  end
-
-  def logout
-    click_link "Logout" rescue nil
-  end
-end
@@ -0,0 +1,23 @@
+module LoginHelpers
+  # Internal: Create and log in as a user of the specified role
+  #
+  # role - User role (e.g., :admin, :user)
+  def login_as(role)
+    @user = Factory(role)
+    login_with(@user)
+  end
+
+  # Internal: Login as the specified user
+  #
+  # user - User instance to login with
+  def login_with(user)
+    visit new_user_session_path
+    fill_in "user_email", with: user.email
+    fill_in "user_password", with: "123456"
+    click_button "Sign in"
+  end
+
+  def logout
+    click_link "Logout" rescue nil
+  end
+end
@@ -0,0 +1,51 @@
+# Stubbing Project <-> git host path
+# create project using Factory only
+class Project
+  def update_repository
+    true
+  end
+
+  def destroy_repository
+    true
+  end
+
+  def path_to_repo
+    File.join(Rails.root, "tmp", "tests", path)
+  end
+
+  def satellite
+    @satellite ||= FakeSatellite.new
+  end
+end
+
+class Key
+  def update_repository
+    true
+  end
+
+  def repository_delete_key
+    true
+  end
+end
+
+class UsersProject
+  def update_repository
+    true
+  end
+end
+
+class FakeSatellite
+  def exists?
+    true
+  end
+
+  def create
+    true
+  end
+end
+
+class ProtectedBranch
+  def update_repository
+    true
+  end
+end
@@ -1,16 +0,0 @@
-shared_examples_for :project_side_pane do
-  subject { page }
-  it { should have_content((@project || project).name) }
-  it { should have_content("Commits") }
-  it { should have_content("Files") }
-end
-
-shared_examples_for :tree_view do
-  subject { page }
-
-  it "should have Tree View of project" do
-    should have_content("app")
-    should have_content("History")
-    should have_content("Gemfile")
-  end
-end
...	...	@@ -28,17 +28,9 @@ class Milestone < ActiveRecord::Base
28	28	end
29	29
30	30	def percent_complete
31		- @percent_complete \|\|= begin
32		- total_i = self.issues.count
33		- closed_i = self.issues.closed.count
34		- if total_i > 0
35		- (closed_i * 100) / total_i
36		- else
37		- 100
38		- end
39		- rescue => ex
40		- 0
41		- end
	31	+ ((self.issues.closed.count * 100) / self.issues.count).abs
	32	+ rescue ZeroDivisionError
	33	+ 100
42	34	end
43	35
44	36	def expires_at
...	...
1		-include LoginMacros
	1	+include LoginHelpers
2	2
3	3	Given /^I signin as a user$/ do
4	4	login_as :user
...	...
...	...	@@ -7,9 +7,9 @@ require 'cucumber/rails'
7	7	require 'webmock/cucumber'
8	8	WebMock.allow_net_connect!
9	9
10		-require Rails.root.join 'spec/monkeypatch'
11	10	require Rails.root.join 'spec/factories'
12		-require Rails.root.join 'spec/support/login'
	11	+require Rails.root.join 'spec/support/monkeypatch'
	12	+require Rails.root.join 'spec/support/login_helpers'
13	13	require Rails.root.join 'spec/support/valid_commit'
14	14
15	15	Capybara.default_selector = :css
...	...
...	...	@@ -1,71 +0,0 @@
1		-require 'spec_helper'
2		-
3		-describe Gitlab::API do
4		- let(:user) { Factory :user }
5		- let!(:project) { Factory :project, owner: user }
6		- let!(:issue) { Factory :issue, author: user, assignee: user, project: project }
7		- before { project.add_access(user, :read) }
8		-
9		- describe "GET /issues" do
10		- it "should return authentication error" do
11		- get "#{api_prefix}/issues"
12		- response.status.should == 401
13		- end
14		-
15		- describe "authenticated GET /issues" do
16		- it "should return an array of issues" do
17		- get "#{api_prefix}/issues?private_token=#{user.private_token}"
18		- response.status.should == 200
19		- json_response.should be_an Array
20		- json_response.first['title'].should == issue.title
21		- end
22		- end
23		- end
24		-
25		- describe "GET /projects/:id/issues" do
26		- it "should return project issues" do
27		- get "#{api_prefix}/projects/#{project.code}/issues?private_token=#{user.private_token}"
28		- response.status.should == 200
29		- json_response.should be_an Array
30		- json_response.first['title'].should == issue.title
31		- end
32		- end
33		-
34		- describe "GET /projects/:id/issues/:issue_id" do
35		- it "should return a project issue by id" do
36		- get "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}"
37		- response.status.should == 200
38		- json_response['title'].should == issue.title
39		- end
40		- end
41		-
42		- describe "POST /projects/:id/issues" do
43		- it "should create a new project issue" do
44		- post "#{api_prefix}/projects/#{project.code}/issues?private_token=#{user.private_token}",
45		- title: 'new issue', labels: 'label, label2'
46		- response.status.should == 201
47		- json_response['title'].should == 'new issue'
48		- json_response['description'].should be_nil
49		- json_response['labels'].should == ['label', 'label2']
50		- end
51		- end
52		-
53		- describe "PUT /projects/:id/issues/:issue_id" do
54		- it "should update a project issue" do
55		- put "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}",
56		- title: 'updated title', labels: 'label2', closed: 1
57		- response.status.should == 200
58		- json_response['title'].should == 'updated title'
59		- json_response['labels'].should == ['label2']
60		- json_response['closed'].should be_true
61		- end
62		- end
63		-
64		- describe "DELETE /projects/:id/issues/:issue_id" do
65		- it "should delete a project issue" do
66		- expect {
67		- delete "#{api_prefix}/projects/#{project.code}/issues/#{issue.id}?private_token=#{user.private_token}"
68		- }.to change { Issue.count }.by(-1)
69		- end
70		- end
71		-end
...	...	@@ -1,136 +0,0 @@
1		-require 'spec_helper'
2		-
3		-describe Gitlab::API do
4		- let(:user) { Factory :user }
5		- let!(:project) { Factory :project, owner: user }
6		- let!(:snippet) { Factory :snippet, author: user, project: project, title: 'example' }
7		- before { project.add_access(user, :read) }
8		-
9		- describe "GET /projects" do
10		- it "should return authentication error" do
11		- get "#{api_prefix}/projects"
12		- response.status.should == 401
13		- end
14		-
15		- describe "authenticated GET /projects" do
16		- it "should return an array of projects" do
17		- get "#{api_prefix}/projects?private_token=#{user.private_token}"
18		- response.status.should == 200
19		- json_response.should be_an Array
20		- json_response.first['name'].should == project.name
21		- json_response.first['owner']['email'].should == user.email
22		- end
23		- end
24		- end
25		-
26		- describe "GET /projects/:id" do
27		- it "should return a project by id" do
28		- get "#{api_prefix}/projects/#{project.id}?private_token=#{user.private_token}"
29		- response.status.should == 200
30		- json_response['name'].should == project.name
31		- json_response['owner']['email'].should == user.email
32		- end
33		-
34		- it "should return a project by code name" do
35		- get "#{api_prefix}/projects/#{project.code}?private_token=#{user.private_token}"
36		- response.status.should == 200
37		- json_response['name'].should == project.name
38		- end
39		-
40		- it "should return a 404 error if not found" do
41		- get "#{api_prefix}/projects/42?private_token=#{user.private_token}"
42		- response.status.should == 404
43		- json_response['message'].should == '404 Not found'
44		- end
45		- end
46		-
47		- describe "GET /projects/:id/repository/branches" do
48		- it "should return an array of project branches" do
49		- get "#{api_prefix}/projects/#{project.code}/repository/branches?private_token=#{user.private_token}"
50		- response.status.should == 200
51		- json_response.should be_an Array
52		- json_response.first['name'].should == project.repo.heads.sort_by(&:name).first.name
53		- end
54		- end
55		-
56		- describe "GET /projects/:id/repository/branches/:branch" do
57		- it "should return the branch information for a single branch" do
58		- get "#{api_prefix}/projects/#{project.code}/repository/branches/new_design?private_token=#{user.private_token}"
59		- response.status.should == 200
60		-
61		- json_response['name'].should == 'new_design'
62		- json_response['commit']['id'].should == '621491c677087aa243f165eab467bfdfbee00be1'
63		- end
64		- end
65		-
66		- describe "GET /projects/:id/repository/tags" do
67		- it "should return an array of project tags" do
68		- get "#{api_prefix}/projects/#{project.code}/repository/tags?private_token=#{user.private_token}"
69		- response.status.should == 200
70		- json_response.should be_an Array
71		- json_response.first['name'].should == project.repo.tags.sort_by(&:name).reverse.first.name
72		- end
73		- end
74		-
75		- describe "GET /projects/:id/snippets/:snippet_id" do
76		- it "should return a project snippet" do
77		- get "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
78		- response.status.should == 200
79		- json_response['title'].should == snippet.title
80		- end
81		- end
82		-
83		- describe "POST /projects/:id/snippets" do
84		- it "should create a new project snippet" do
85		- post "#{api_prefix}/projects/#{project.code}/snippets?private_token=#{user.private_token}",
86		- title: 'api test', file_name: 'sample.rb', code: 'test'
87		- response.status.should == 201
88		- json_response['title'].should == 'api test'
89		- end
90		- end
91		-
92		- describe "PUT /projects/:id/snippets" do
93		- it "should update an existing project snippet" do
94		- put "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}",
95		- code: 'updated code'
96		- response.status.should == 200
97		- json_response['title'].should == 'example'
98		- snippet.reload.content.should == 'updated code'
99		- end
100		- end
101		-
102		- describe "DELETE /projects/:id/snippets/:snippet_id" do
103		- it "should delete existing project snippet" do
104		- expect {
105		- delete "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}?private_token=#{user.private_token}"
106		- }.to change { Snippet.count }.by(-1)
107		- end
108		- end
109		-
110		- describe "GET /projects/:id/snippets/:snippet_id/raw" do
111		- it "should get a raw project snippet" do
112		- get "#{api_prefix}/projects/#{project.code}/snippets/#{snippet.id}/raw?private_token=#{user.private_token}"
113		- response.status.should == 200
114		- end
115		- end
116		-
117		- describe "GET /projects/:id/:sha/blob" do
118		- it "should get the raw file contents" do
119		- get "#{api_prefix}/projects/#{project.code}/repository/commits/master/blob?filepath=README.md&private_token=#{user.private_token}"
120		-
121		- response.status.should == 200
122		- end
123		-
124		- it "should return 404 for invalid branch_name" do
125		- get "#{api_prefix}/projects/#{project.code}/repository/commits/invalid_branch_name/blob?filepath=README.md&private_token=#{user.private_token}"
126		-
127		- response.status.should == 404
128		- end
129		-
130		- it "should return 404 for invalid file" do
131		- get "#{api_prefix}/projects/#{project.code}/repository/commits/master/blob?filepath=README.invalid&private_token=#{user.private_token}"
132		-
133		- response.status.should == 404
134		- end
135		- end
136		-end
...	...	@@ -1,37 +0,0 @@
1		-require 'spec_helper'
2		-
3		-describe Gitlab::API do
4		- let(:user) { Factory :user }
5		-
6		- describe "GET /users" do
7		- it "should return authentication error" do
8		- get "#{api_prefix}/users"
9		- response.status.should == 401
10		- end
11		-
12		- describe "authenticated GET /users" do
13		- it "should return an array of users" do
14		- get "#{api_prefix}/users?private_token=#{user.private_token}"
15		- response.status.should == 200
16		- json_response.should be_an Array
17		- json_response.first['email'].should == user.email
18		- end
19		- end
20		- end
21		-
22		- describe "GET /users/:id" do
23		- it "should return a user by id" do
24		- get "#{api_prefix}/users/#{user.id}?private_token=#{user.private_token}"
25		- response.status.should == 200
26		- json_response['email'].should == user.email
27		- end
28		- end
29		-
30		- describe "GET /user" do
31		- it "should return current user" do
32		- get "#{api_prefix}/user?private_token=#{user.private_token}"
33		- response.status.should == 200
34		- json_response['email'].should == user.email
35		- end
36		- end
37		-end
...	...	@@ -1,48 +0,0 @@
1		-require 'spec_helper'
2		-
3		-describe ActivityObserver do
4		- let(:project) { Factory :project }
5		-
6		- def self.it_should_be_valid_event
7		- it { @event.should_not be_nil }
8		- it { @event.project.should == project }
9		- end
10		-
11		- describe "Merge Request created" do
12		- before do
13		- MergeRequest.observers.enable :activity_observer do
14		- @merge_request = Factory :merge_request, project: project
15		- @event = Event.last
16		- end
17		- end
18		-
19		- it_should_be_valid_event
20		- it { @event.action.should == Event::Created }
21		- it { @event.target.should == @merge_request }
22		- end
23		-
24		- describe "Issue created" do
25		- before do
26		- Issue.observers.enable :activity_observer do
27		- @issue = Factory :issue, project: project
28		- @event = Event.last
29		- end
30		- end
31		-
32		- it_should_be_valid_event
33		- it { @event.action.should == Event::Created }
34		- it { @event.target.should == @issue }
35		- end
36		-
37		- #describe "Issue commented" do
38		- #before do
39		- #@issue = Factory :issue, project: project
40		- #@note = Factory :note, noteable: @issue, project: project
41		- #@event = Event.last
42		- #end
43		-
44		- #it_should_be_valid_event
45		- #it { @event.action.should == Event::Commented }
46		- #it { @event.target.should == @note }
47		- #end
48		-end
...	...	@@ -1,144 +0,0 @@
1		-require 'spec_helper'
2		-
3		-describe IssueObserver do
4		- let(:some_user) { double(:user, id: 1) }
5		- let(:assignee) { double(:user, id: 2) }
6		- let(:issue) { double(:issue, id: 42, assignee: assignee) }
7		-
8		- before(:each) { subject.stub(:current_user).and_return(some_user) }
9		-
10		- subject { IssueObserver.instance }
11		-
12		- describe '#after_create' do
13		-
14		- it 'is called when an issue is created' do
15		- subject.should_receive(:after_create)
16		-
17		- Issue.observers.enable :issue_observer do
18		- Factory.create(:issue, project: Factory.create(:project))
19		- end
20		- end
21		-
22		- it 'sends an email to the assignee' do
23		- Notify.should_receive(:new_issue_email).with(issue.id).
24		- and_return(double(deliver: true))
25		-
26		- subject.after_create(issue)
27		- end
28		-
29		- it 'does not send an email to the assignee if assignee created the issue' do
30		- subject.stub(:current_user).and_return(assignee)
31		- Notify.should_not_receive(:new_issue_email)
32		-
33		- subject.after_create(issue)
34		- end
35		- end
36		-
37		- context '#after_update' do
38		- before(:each) do
39		- issue.stub(:is_being_reassigned?).and_return(false)
40		- issue.stub(:is_being_closed?).and_return(false)
41		- issue.stub(:is_being_reopened?).and_return(false)
42		- end
43		-
44		- it 'is called when an issue is changed' do
45		- changed = Factory.create(:issue, project: Factory.create(:project))
46		- subject.should_receive(:after_update)
47		-
48		- Issue.observers.enable :issue_observer do
49		- changed.description = 'I changed'
50		- changed.save
51		- end
52		- end
53		-
54		- context 'a reassigned email' do
55		- it 'is sent if the issue is being reassigned' do
56		- issue.should_receive(:is_being_reassigned?).and_return(true)
57		- subject.should_receive(:send_reassigned_email).with(issue)
58		-
59		- subject.after_update(issue)
60		- end
61		-
62		- it 'is not sent if the issue is not being reassigned' do
63		- issue.should_receive(:is_being_reassigned?).and_return(false)
64		- subject.should_not_receive(:send_reassigned_email)
65		-
66		- subject.after_update(issue)
67		- end
68		- end
69		-
70		- context 'a status "closed" note' do
71		- it 'is created if the issue is being closed' do
72		- issue.should_receive(:is_being_closed?).and_return(true)
73		- Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed')
74		-
75		- subject.after_update(issue)
76		- end
77		-
78		- it 'is not created if the issue is not being closed' do
79		- issue.should_receive(:is_being_closed?).and_return(false)
80		- Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'closed')
81		-
82		- subject.after_update(issue)
83		- end
84		- end
85		-
86		- context 'a status "reopened" note' do
87		- it 'is created if the issue is being reopened' do
88		- issue.should_receive(:is_being_reopened?).and_return(true)
89		- Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened')
90		-
91		- subject.after_update(issue)
92		- end
93		-
94		- it 'is not created if the issue is not being reopened' do
95		- issue.should_receive(:is_being_reopened?).and_return(false)
96		- Note.should_not_receive(:create_status_change_note).with(issue, some_user, 'reopened')
97		-
98		- subject.after_update(issue)
99		- end
100		- end
101		- end
102		-
103		- describe '#send_reassigned_email' do
104		- let(:previous_assignee) { double(:user, id: 3) }
105		-
106		- before(:each) do
107		- issue.stub(:assignee_id).and_return(assignee.id)
108		- issue.stub(:assignee_id_was).and_return(previous_assignee.id)
109		- end
110		-
111		- def it_sends_a_reassigned_email_to(recipient)
112		- Notify.should_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id).
113		- and_return(double(deliver: true))
114		- end
115		-
116		- def it_does_not_send_a_reassigned_email_to(recipient)
117		- Notify.should_not_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id)
118		- end
119		-
120		- it 'sends a reassigned email to the previous and current assignees' do
121		- it_sends_a_reassigned_email_to assignee.id
122		- it_sends_a_reassigned_email_to previous_assignee.id
123		-
124		- subject.send(:send_reassigned_email, issue)
125		- end
126		-
127		- context 'does not send an email to the user who made the reassignment' do
128		- it 'if the user is the assignee' do
129		- subject.stub(:current_user).and_return(assignee)
130		- it_sends_a_reassigned_email_to previous_assignee.id
131		- it_does_not_send_a_reassigned_email_to assignee.id
132		-
133		- subject.send(:send_reassigned_email, issue)
134		- end
135		- it 'if the user is the previous assignee' do
136		- subject.stub(:current_user).and_return(previous_assignee)
137		- it_sends_a_reassigned_email_to assignee.id
138		- it_does_not_send_a_reassigned_email_to previous_assignee.id
139		-
140		- subject.send(:send_reassigned_email, issue)
141		- end
142		- end
143		- end
144		-end
...	...	@@ -31,24 +31,33 @@ describe Milestone do
31	31
32	32	it { milestone.should be_valid }
33	33
34		- describe "Issues" do
35		- before do
	34	+ describe "#percent_complete" do
	35	+ it "should not count open issues" do
36	36	milestone.issues << issue
	37	+ milestone.percent_complete.should == 0
37	38	end
38	39
39		- it { milestone.percent_complete.should == 0 }
	40	+ it "should count closed issues" do
	41	+ issue.update_attributes(closed: true)
	42	+ milestone.issues << issue
	43	+ milestone.percent_complete.should == 100
	44	+ end
40	45
41		- it do
42		- issue.update_attributes closed: true
	46	+ it "should recover from dividing by zero" do
	47	+ milestone.issues.should_receive(:count).and_return(0)
43	48	milestone.percent_complete.should == 100
44	49	end
45	50	end
46	51
47		- describe :expires_at do
48		- before do
49		- milestone.update_attributes due_date: Date.today + 1.day
	52	+ describe "#expires_at" do
	53	+ it "should be nil when due_date is unset" do
	54	+ milestone.update_attributes(due_date: nil)
	55	+ milestone.expires_at.should be_nil
50	56	end
51	57
52		- it { milestone.expires_at.should_not be_nil }
	58	+ it "should not be nil when due_date is set" do
	59	+ milestone.update_attributes(due_date: Date.tomorrow)
	60	+ milestone.expires_at.should be_present
	61	+ end
53	62	end
54	63	end
...	...
...	...	@@ -1,26 +0,0 @@
1		-require 'spec_helper'
2		-
3		-describe UserObserver do
4		- subject { UserObserver.instance }
5		-
6		- it 'calls #after_create when new users are created' do
7		- new_user = Factory.new(:user)
8		- subject.should_receive(:after_create).with(new_user)
9		-
10		- User.observers.enable :user_observer do
11		- new_user.save
12		- end
13		- end
14		-
15		- context 'when a new user is created' do
16		- let(:user) { double(:user, id: 42, password: 'P@ssword!') }
17		- let(:notification) { double :notification }
18		-
19		- it 'sends an email' do
20		- notification.should_receive(:deliver)
21		- Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
22		-
23		- subject.after_create(user)
24		- end
25		- end
26		-end