Dashboard refactoring:

* dashboard should be in dashboard controller not project index * projects index removed

Dashboard refactoring:
* dashboard should be in dashboard controller not project index * projects index removed
randx
1 parent 9ef9c58f
Showing 17 changed files with 169 additions and 186 deletions Show diff stats
app/assets/stylesheets/common.scss
app/controllers/dashboard_controller.rb
app/helpers/application_helper.rb
app/views/dashboard/index.atom.builder
app/views/dashboard/index.html.haml
app/views/dashboard/index.js.haml
app/views/layouts/_app_menu.html.haml
app/views/projects/index.atom.builder
app/views/projects/index.html.haml
app/views/projects/index.js.haml
app/views/projects/show.html.haml
config/routes.rb
spec/requests/dashboard_spec.rb
spec/requests/last_push_widget_spec.rb
spec/requests/projects_security_spec.rb
spec/requests/projects_spec.rb
spec/requests/top_panel_spec.rb
@@ -659,6 +659,10 @@ li.note {
     width:24px;
     vertical-align:top;
   }
+
+  strong { 
+    line-height:24px;
+  }
 }
 .automerge_widget { 
@@ -741,7 +745,7 @@ li.note {
  */
 .event_lp { 
   @extend .alert-info;
-  margin-bottom:15px;
+  margin-bottom:20px;
   padding:8px;
   border-style: solid;
   border-width: 1px;
@@ -2,18 +2,17 @@ class DashboardController &lt; ApplicationController
   respond_to :html
   def index
-    @projects = current_user.projects.all
-
-    @active_projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
+    @projects = current_user.projects.includes(:events).order("events.created_at DESC")
+    @projects = @projects.page(params[:page]).per(40)
-    @merge_requests = MergeRequest.where("author_id = :id or assignee_id = :id", :id => current_user.id).opened.order("created_at DESC").limit(5)
+    @events = Event.where(:project_id => current_user.projects.map(&:id)).recent.limit(20)
-    @user   = current_user
-    @issues = current_user.assigned_issues.opened.order("created_at DESC").limit(5)
-    @issues = @issues.includes(:author, :project)
+    @last_push = current_user.recent_push
-    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(20)
-    @last_push = Event.where(:project_id => @projects.map(&:id)).recent.code_push.limit(1).first
+    respond_to do |format|
+      format.html
+      format.atom { render :layout => false }
+    end
   end
   # Get authored or assigned open merge requests
@@ -60,8 +60,9 @@ module ApplicationHelper
   def search_autocomplete_source
     projects = current_user.projects.map{ |p| { :label => p.name, :url => project_path(p) } }
     default_nav = [
+      { :label => "Profile", :url => profile_path },
       { :label => "Keys", :url => keys_path },
-      { :label => "Projects", :url => projects_path },
+      { :label => "Dashboard", :url => root_path },
       { :label => "Admin", :url => admin_root_path }
     ]
@@ -0,0 +1,36 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
+  xml.title   "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
+  xml.link    :href => projects_url(:atom), :rel => "self", :type => "application/atom+xml"
+  xml.link    :href => projects_url, :rel => "alternate", :type => "text/html"
+  xml.id      projects_url
+  xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
+
+  @events.each do |event|
+    if event.allowed?
+      xml.entry do
+        if event.issue?
+          event_link  = project_issue_url(event.project, event.issue)
+          event_title = event.issue_title
+        elsif event.merge_request?
+          event_link  = project_merge_request_url(event.project, event.merge_request)
+          event_title = event.merge_request_title
+        elsif event.push?
+          event_link  = project_commits_url(event.project, :ref => event.ref_name)
+          event_title = event.ref_name
+        end
+
+        xml.id      "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
+        xml.link    :href => event_link
+        xml.title   truncate(event_title, :length => 80)
+        xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
+        xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(event.author_email)
+        xml.author do |author|
+          xml.name event.author_name
+          xml.email event.author_email
+        end
+        xml.summary event_title
+      end
+    end
+  end
+end
@@ -0,0 +1,56 @@
+- if @projects.any?
+  .projects
+    .activities.span8
+      - if current_user.require_ssh_key?
+        .alert.alert-error.padded
+          %span
+            You wont be able to pull/push project code unless you
+            %strong
+              = link_to new_key_path, :class => "vlink" do
+                add new key
+            to your profile
+      - if @events.any?
+        = render @events
+      - else
+        %h4.nothing_here_message Projects activity will be displayed here
+    .side
+      = render "events/event_last_push", :event => @last_push
+      .projects_box
+        %h5
+          Projects
+          %small
+            (#{@projects.total_count})
+          - if current_user.can_create_project?
+            %span.right
+              = link_to new_project_path, :class => "btn very_small info" do
+                %i.icon-plus
+                New Project
+        - @projects.each do |project|
+          = link_to project_path(project), :class => dom_class(project) do
+            %h4
+              %span.ico.project
+              = truncate(project.name, :length => 25)
+              %span.right
+                &rarr;
+        .bottom= paginate @projects, :theme => "gitlab"
+
+      %hr
+      %div
+        %span.rss-icon
+          = link_to dashboard_path(:atom, { :private_token => current_user.private_token }) do
+            = image_tag "rss_ui.png", :title => "feed"
+            %strong News Feed
+
+- else
+  %h3.nothing_here_message There are no projects you have access to.
+  %br
+  %h4.nothing_here_message
+    - if current_user.can_create_project?
+      You can create up to
+      = current_user.projects_limit
+      projects. Click on button below to add a new one
+      .link_holder
+        = link_to new_project_path, :class => "btn primary" do
+          New Project »
+    - else
+      If you will be added to project - it will be displayed here
@@ -0,0 +1,2 @@
+:plain 
+  $(".projects .activities").append("#{escape_javascript(render(@events))}");
 %nav.main_menu
-  = link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"
+  = link_to "Home", root_path, :class => "home #{"current" if current_page?(dashboard_path) || current_page?(root_path)}", :title => "Home"
   = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do
     Issues
     %span.count= current_user.assigned_issues.opened.count
@@ -1,36 +0,0 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
-  xml.link    :href => projects_url(:atom), :rel => "self", :type => "application/atom+xml"
-  xml.link    :href => projects_url, :rel => "alternate", :type => "text/html"
-  xml.id      projects_url
-  xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
-
-  @events.each do |event|
-    if event.allowed?
-      xml.entry do
-        if event.issue?
-          event_link  = project_issue_url(event.project, event.issue)
-          event_title = event.issue_title
-        elsif event.merge_request?
-          event_link  = project_merge_request_url(event.project, event.merge_request)
-          event_title = event.merge_request_title
-        elsif event.push?
-          event_link  = project_commits_url(event.project, :ref => event.ref_name)
-          event_title = event.ref_name
-        end
-
-        xml.id      "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
-        xml.link    :href => event_link
-        xml.title   truncate(event_title, :length => 80)
-        xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
-        xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(event.author_email)
-        xml.author do |author|
-          xml.name event.author_name
-          xml.email event.author_email
-        end
-        xml.summary event_title
-      end
-    end
-  end
-end
@@ -1,49 +0,0 @@
-- if @projects.any?
-  .projects
-    .activities.span8
-      - if current_user.require_ssh_key?
-        .alert.alert-error.padded
-          %span
-            You wont be able to pull/push project code unless you
-            %strong
-              = link_to new_key_path, :class => "vlink" do
-                add new key
-            to your profile
-      - if @events.any?
-        = render @events
-      - else
-        %h4.nothing_here_message Projects activity will be displayed here
-    .side
-      = render "events/event_last_push", :event => @last_push
-      .projects_box
-        %h5
-          Projects
-          %small
-            (#{@projects.total_count})
-          - if current_user.can_create_project?
-            %span.right
-              = link_to new_project_path, :class => "btn very_small info" do
-                %i.icon-plus
-                New Project
-        - @projects.each do |project|
-          = link_to project_path(project), :class => dom_class(project) do
-            %h4
-              %span.ico.project
-              = truncate(project.name, :length => 25)
-              %span.right
-                &rarr;
-        .bottom= paginate @projects, :theme => "gitlab"
-
-- else
-  %h3.nothing_here_message There are no projects you have access to.
-  %br
-  %h4.nothing_here_message
-    - if current_user.can_create_project?
-      You can create up to
-      = current_user.projects_limit
-      projects. Click on button below to add a new one
-      .link_holder
-        = link_to new_project_path, :class => "btn primary" do
-          New Project »
-    - else
-      If you will be added to project - it will be displayed here
@@ -1,2 +0,0 @@
-:plain
-  Pager.append(#{@projects.count}, "#{escape_javascript(render(:partial => 'projects/tile'))}");
@@ -2,10 +2,6 @@
 .entry
   .row
-    -#.span2
-      .back_link
-        = link_to projects_path do
-          &larr; To projects list
     .span7
       .form-horizontal
         .input-prepend
@@ -33,6 +33,10 @@ Gitlab::Application.routes.draw do
   end
   get "errors/githost"
+
+  #
+  # Profile Area
+  #
   get "profile/password", :to => "profile#password"
   put "profile/password", :to => "profile#password_update"
   get "profile/token", :to => "profile#token"
@@ -41,10 +45,14 @@ Gitlab::Application.routes.draw do
   get "profile/design", :to => "profile#design"
   put "profile/update", :to => "profile#update"
+  #
+  # Dashboard Area
+  #
+  get "dashboard", :to => "dashboard#index"
   get "dashboard/issues", :to => "dashboard#issues"
   get "dashboard/merge_requests", :to => "dashboard#merge_requests"
-  resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create, :index]
+  resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create]
   resources :keys
   devise_for :users, :controllers => { :omniauth_callbacks => :omniauth_callbacks }
@@ -145,5 +153,5 @@ Gitlab::Application.routes.draw do
     end
     resources :notes, :only => [:index, :create, :destroy]
   end
-  root :to => "projects#index"
+  root :to => "dashboard#index"
 end
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe "User Dashboard" do
+  before { login_as :user }
+
+  describe "GET /" do
+    before do
+      @project = Factory :project, :owner => @user
+      @project.add_access(@user, :read)
+      visit dashboard_path
+    end
+
+    it "should be on projects page" do
+      current_path.should == dashboard_path
+    end
+
+    it "should have link to new project" do
+      page.should have_content("New Project")
+    end
+
+    it "should have project" do
+      page.should have_content(@project.name)
+    end
+
+    it "should render projects atom feed via private token" do
+      logout
+
+      visit dashboard_path(:atom, :private_token => @user.private_token)
+      page.body.should have_selector("feed title")
+    end
+
+    it "should not render projects page via private token" do
+      logout
+
+      visit dashboard_path(:private_token => @user.private_token)
+      current_path.should == new_user_session_path
+    end
+  end
+end
@@ -7,7 +7,7 @@ describe &quot;Last Push widget&quot; do
     @project = Factory :project, :owner => @user
     @project.add_access(@user, :read)
     create_push_event
-    visit projects_path
+    visit dashboard_path
   end
   it "should display last push widget with link to merge request page" do 
 require 'spec_helper'
-describe "Projects" do
-  describe "GET /projects" do
-    it { projects_path.should be_allowed_for :admin }
-    it { projects_path.should be_allowed_for :user }
-    it { projects_path.should be_denied_for :visitor }
+describe "Projects Security" do
+  describe "GET /" do
+    it { root_path.should be_allowed_for :admin }
+    it { root_path.should be_allowed_for :user }
+    it { root_path.should be_denied_for :visitor }
   end
   describe "GET /projects/new" do
-    it { projects_path.should be_allowed_for :admin }
-    it { projects_path.should be_allowed_for :user }
-    it { projects_path.should be_denied_for :visitor }
+    it { new_project_path.should be_allowed_for :admin }
+    it { new_project_path.should be_allowed_for :user }
+    it { new_project_path.should be_denied_for :visitor }
   end
   describe "Project" do
@@ -3,43 +3,9 @@ require &#39;spec_helper&#39;
 describe "Projects" do
   before { login_as :user }
-  describe "GET /projects" do
-    before do
-      @project = Factory :project, :owner => @user
-      @project.add_access(@user, :read)
-      visit projects_path
-    end
-
-    it "should be on projects page" do
-      current_path.should == projects_path
-    end
-
-    it "should have link to new project" do
-      page.should have_content("New Project")
-    end
-
-    it "should have project" do
-      page.should have_content(@project.name)
-    end
-
-    it "should render projects atom feed via private token" do
-      logout
-
-      visit projects_path(:atom, :private_token => @user.private_token)
-      page.body.should have_selector("feed title")
-    end
-
-    it "should not render projects page via private token" do
-      logout
-
-      visit projects_path(:private_token => @user.private_token)
-      current_path.should == new_user_session_path
-    end
-  end
-
   describe "GET /projects/new" do
     before do
-      visit projects_path
+      visit root_path
       click_link "New Project"
     end
@@ -1,37 +0,0 @@
-__END__
-require 'spec_helper'
-
-describe "Top Panel", :js => true do
-  before { login_as :user }
-
-  describe "Search autocomplete" do
-    before do
-      visit projects_path
-      fill_in "search", :with => "Ke"
-      within ".ui-autocomplete" do
-        find(:xpath, "//a[.=\"Keys\"]").click
-      end
-    end
-
-    it "should be on projects page" do
-      current_path.should == keys_path
-    end
-  end
-
-  describe "with project" do
-    before do
-      @project = Factory :project
-      @project.add_access(@user, :read)
-      visit project_path(@project)
-
-      fill_in "search", :with => "Commi"
-      within ".ui-autocomplete" do
-        find(:xpath, "//a[.=\"#{@project.code} / Commits\"]").click
-      end
-    end
-
-    it "should be on projects page" do
-      current_path.should == project_commits_path(@project)
-    end
-  end
-end
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+xml.instruct!
	2	+xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
	3	+ xml.title "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
	4	+ xml.link :href => projects_url(:atom), :rel => "self", :type => "application/atom+xml"
	5	+ xml.link :href => projects_url, :rel => "alternate", :type => "text/html"
	6	+ xml.id projects_url
	7	+ xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
	8	+
	9	+ @events.each do \|event\|
	10	+ if event.allowed?
	11	+ xml.entry do
	12	+ if event.issue?
	13	+ event_link = project_issue_url(event.project, event.issue)
	14	+ event_title = event.issue_title
	15	+ elsif event.merge_request?
	16	+ event_link = project_merge_request_url(event.project, event.merge_request)
	17	+ event_title = event.merge_request_title
	18	+ elsif event.push?
	19	+ event_link = project_commits_url(event.project, :ref => event.ref_name)
	20	+ event_title = event.ref_name
	21	+ end
	22	+
	23	+ xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
	24	+ xml.link :href => event_link
	25	+ xml.title truncate(event_title, :length => 80)
	26	+ xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
	27	+ xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(event.author_email)
	28	+ xml.author do \|author\|
	29	+ xml.name event.author_name
	30	+ xml.email event.author_email
	31	+ end
	32	+ xml.summary event_title
	33	+ end
	34	+ end
	35	+ end
	36	+end
@@ -0,0 +1,56 @@		@@ -0,0 +1,56 @@
	1	+- if @projects.any?
	2	+ .projects
	3	+ .activities.span8
	4	+ - if current_user.require_ssh_key?
	5	+ .alert.alert-error.padded
	6	+ %span
	7	+ You wont be able to pull/push project code unless you
	8	+ %strong
	9	+ = link_to new_key_path, :class => "vlink" do
	10	+ add new key
	11	+ to your profile
	12	+ - if @events.any?
	13	+ = render @events
	14	+ - else
	15	+ %h4.nothing_here_message Projects activity will be displayed here
	16	+ .side
	17	+ = render "events/event_last_push", :event => @last_push
	18	+ .projects_box
	19	+ %h5
	20	+ Projects
	21	+ %small
	22	+ (#{@projects.total_count})
	23	+ - if current_user.can_create_project?
	24	+ %span.right
	25	+ = link_to new_project_path, :class => "btn very_small info" do
	26	+ %i.icon-plus
	27	+ New Project
	28	+ - @projects.each do \|project\|
	29	+ = link_to project_path(project), :class => dom_class(project) do
	30	+ %h4
	31	+ %span.ico.project
	32	+ = truncate(project.name, :length => 25)
	33	+ %span.right
	34	+ →
	35	+ .bottom= paginate @projects, :theme => "gitlab"
	36	+
	37	+ %hr
	38	+ %div
	39	+ %span.rss-icon
	40	+ = link_to dashboard_path(:atom, { :private_token => current_user.private_token }) do
	41	+ = image_tag "rss_ui.png", :title => "feed"
	42	+ %strong News Feed
	43	+
	44	+- else
	45	+ %h3.nothing_here_message There are no projects you have access to.
	46	+ %br
	47	+ %h4.nothing_here_message
	48	+ - if current_user.can_create_project?
	49	+ You can create up to
	50	+ = current_user.projects_limit
	51	+ projects. Click on button below to add a new one
	52	+ .link_holder
	53	+ = link_to new_project_path, :class => "btn primary" do
	54	+ New Project »
	55	+ - else
	56	+ If you will be added to project - it will be displayed here
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+:plain
	2	+ $(".projects .activities").append("#{escape_javascript(render(@events))}");
1	%nav.main_menu	1	%nav.main_menu
2	- = link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) \|\| current_page?(root_path)}", :title => "Home"	2	+ = link_to "Home", root_path, :class => "home #{"current" if current_page?(dashboard_path) \|\| current_page?(root_path)}", :title => "Home"
3	= link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do	3	= link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do
4	Issues	4	Issues
5	%span.count= current_user.assigned_issues.opened.count	5	%span.count= current_user.assigned_issues.opened.count
	@@ -1,36 +0,0 @@	@@ -1,36 +0,0 @@
1	-xml.instruct!
2	-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
3	- xml.title "Dashboard feed#{" - #{current_user.name}" if current_user.name.present?}"
4	- xml.link :href => projects_url(:atom), :rel => "self", :type => "application/atom+xml"
5	- xml.link :href => projects_url, :rel => "alternate", :type => "text/html"
6	- xml.id projects_url
7	- xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any?
8	-
9	- @events.each do \|event\|
10	- if event.allowed?
11	- xml.entry do
12	- if event.issue?
13	- event_link = project_issue_url(event.project, event.issue)
14	- event_title = event.issue_title
15	- elsif event.merge_request?
16	- event_link = project_merge_request_url(event.project, event.merge_request)
17	- event_title = event.merge_request_title
18	- elsif event.push?
19	- event_link = project_commits_url(event.project, :ref => event.ref_name)
20	- event_title = event.ref_name
21	- end
22	-
23	- xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
24	- xml.link :href => event_link
25	- xml.title truncate(event_title, :length => 80)
26	- xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
27	- xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(event.author_email)
28	- xml.author do \|author\|
29	- xml.name event.author_name
30	- xml.email event.author_email
31	- end
32	- xml.summary event_title
33	- end
34	- end
35	- end
36	-end
	@@ -1,49 +0,0 @@	@@ -1,49 +0,0 @@
1	-- if @projects.any?
2	- .projects
3	- .activities.span8
4	- - if current_user.require_ssh_key?
5	- .alert.alert-error.padded
6	- %span
7	- You wont be able to pull/push project code unless you
8	- %strong
9	- = link_to new_key_path, :class => "vlink" do
10	- add new key
11	- to your profile
12	- - if @events.any?
13	- = render @events
14	- - else
15	- %h4.nothing_here_message Projects activity will be displayed here
16	- .side
17	- = render "events/event_last_push", :event => @last_push
18	- .projects_box
19	- %h5
20	- Projects
21	- %small
22	- (#{@projects.total_count})
23	- - if current_user.can_create_project?
24	- %span.right
25	- = link_to new_project_path, :class => "btn very_small info" do
26	- %i.icon-plus
27	- New Project
28	- - @projects.each do \|project\|
29	- = link_to project_path(project), :class => dom_class(project) do
30	- %h4
31	- %span.ico.project
32	- = truncate(project.name, :length => 25)
33	- %span.right
34	- →
35	- .bottom= paginate @projects, :theme => "gitlab"
36	-
37	-- else
38	- %h3.nothing_here_message There are no projects you have access to.
39	- %br
40	- %h4.nothing_here_message
41	- - if current_user.can_create_project?
42	- You can create up to
43	- = current_user.projects_limit
44	- projects. Click on button below to add a new one
45	- .link_holder
46	- = link_to new_project_path, :class => "btn primary" do
47	- New Project »
48	- - else
49	- If you will be added to project - it will be displayed here
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-:plain
2	- Pager.append(#{@projects.count}, "#{escape_javascript(render(:partial => 'projects/tile'))}");
@@ -0,0 +1,39 @@		@@ -0,0 +1,39 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "User Dashboard" do
	4	+ before { login_as :user }
	5	+
	6	+ describe "GET /" do
	7	+ before do
	8	+ @project = Factory :project, :owner => @user
	9	+ @project.add_access(@user, :read)
	10	+ visit dashboard_path
	11	+ end
	12	+
	13	+ it "should be on projects page" do
	14	+ current_path.should == dashboard_path
	15	+ end
	16	+
	17	+ it "should have link to new project" do
	18	+ page.should have_content("New Project")
	19	+ end
	20	+
	21	+ it "should have project" do
	22	+ page.should have_content(@project.name)
	23	+ end
	24	+
	25	+ it "should render projects atom feed via private token" do
	26	+ logout
	27	+
	28	+ visit dashboard_path(:atom, :private_token => @user.private_token)
	29	+ page.body.should have_selector("feed title")
	30	+ end
	31	+
	32	+ it "should not render projects page via private token" do
	33	+ logout
	34	+
	35	+ visit dashboard_path(:private_token => @user.private_token)
	36	+ current_path.should == new_user_session_path
	37	+ end
	38	+ end
	39	+end
	@@ -7,7 +7,7 @@ describe "Last Push widget" do		@@ -7,7 +7,7 @@ describe "Last Push widget" do
7	@project = Factory :project, :owner => @user	7	@project = Factory :project, :owner => @user
8	@project.add_access(@user, :read)	8	@project.add_access(@user, :read)
9	create_push_event	9	create_push_event
10	- visit projects_path	10	+ visit dashboard_path
11	end	11	end
12		12
13	it "should display last push widget with link to merge request page" do	13	it "should display last push widget with link to merge request page" do
	@@ -3,43 +3,9 @@ require 'spec_helper'		@@ -3,43 +3,9 @@ require 'spec_helper'
3	describe "Projects" do	3	describe "Projects" do
4	before { login_as :user }	4	before { login_as :user }
5		5
6	- describe "GET /projects" do
7	- before do
8	- @project = Factory :project, :owner => @user
9	- @project.add_access(@user, :read)
10	- visit projects_path
11	- end
12	-
13	- it "should be on projects page" do
14	- current_path.should == projects_path
15	- end
16	-
17	- it "should have link to new project" do
18	- page.should have_content("New Project")
19	- end
20	-
21	- it "should have project" do
22	- page.should have_content(@project.name)
23	- end
24	-
25	- it "should render projects atom feed via private token" do
26	- logout
27	-
28	- visit projects_path(:atom, :private_token => @user.private_token)
29	- page.body.should have_selector("feed title")
30	- end
31	-
32	- it "should not render projects page via private token" do
33	- logout
34	-
35	- visit projects_path(:private_token => @user.private_token)
36	- current_path.should == new_user_session_path
37	- end
38	- end
39	-
40	describe "GET /projects/new" do	6	describe "GET /projects/new" do
41	before do	7	before do
42	- visit projects_path	8	+ visit root_path
43	click_link "New Project"	9	click_link "New Project"
44	end	10	end
45		11