7 files changed, 157 insertions, 28 deletions

diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index 1826ead1d51..8508b2a8096 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -21,7 +21,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
   end
 
   step 'I see prefilled new Merge Request page' do
-    current_path.should == new_project_merge_request_path(@project)
+    current_path.should == new_namespace_project_merge_request_path(@project.namespace, @project)
     find("#merge_request_target_project_id").value.should == @project.id.to_s
     find("#merge_request_source_branch").value.should == "fix"
     find("#merge_request_target_branch").value.should == "master"
@@ -37,8 +37,8 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
     )
   end
 
-  step 'I should see "John Doe joined project at Shop" event' do
-    page.should have_content "John Doe joined project at #{project.name_with_namespace}"
+  step 'I should see "John Doe joined project Shop" event' do
+    page.should have_content "John Doe joined project #{project.name_with_namespace}"
   end
 
   step 'user with name "John Doe" left project "Shop"' do
@@ -50,8 +50,8 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
     )
   end
 
-  step 'I should see "John Doe left project at Shop" event' do
-    page.should have_content "John Doe left project at #{project.name_with_namespace}"
+  step 'I should see "John Doe left project Shop" event' do
+    page.should have_content "John Doe left project #{project.name_with_namespace}"
   end
 
   step 'I have group with projects' do
diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb
index 332bfa95d97..3da3d62d0c0 100644
--- a/features/steps/dashboard/event_filters.rb
+++ b/features/steps/dashboard/event_filters.rb
@@ -29,7 +29,7 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
 
   step 'this project has push event' do
     data = {
-      before: "0000000000000000000000000000000000000000",
+      before: Gitlab::Git::BLANK_SHA,
       after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
       ref: "refs/heads/new_design",
       user_id: @user.id,
diff --git a/features/steps/dashboard/group.rb b/features/steps/dashboard/group.rb
new file mode 100644
index 00000000000..8384df2fb59
--- /dev/null
+++ b/features/steps/dashboard/group.rb
@@ -0,0 +1,63 @@
+class Spinach::Features::DashboardGroup < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedGroup
+  include SharedPaths
+  include SharedUser
+
+  # Leave
+
+  step 'I click on the "Leave" button for group "Owned"' do
+    find(:css, 'li', text: "Owner").find(:css, 'i.fa.fa-sign-out').click
+    # poltergeist always confirms popups.
+  end
+
+  step 'I click on the "Leave" button for group "Guest"' do
+    find(:css, 'li', text: "Guest").find(:css, 'i.fa.fa-sign-out').click
+    # poltergeist always confirms popups.
+  end
+
+  step 'I should not see the "Leave" button for group "Owned"' do
+    find(:css, 'li', text: "Owner").should_not have_selector(:css, 'i.fa.fa-sign-out')
+    # poltergeist always confirms popups.
+  end
+
+  step 'I should not see the "Leave" button for groupr "Guest"' do
+    find(:css, 'li', text: "Guest").should_not have_selector(:css,  'i.fa.fa-sign-out')
+    # poltergeist always confirms popups.
+  end
+
+  step 'I should see group "Owned" in group list' do
+    page.should have_content("Owned")
+  end
+
+  step 'I should not see group "Owned" in group list' do
+    page.should_not have_content("Owned")
+  end
+
+  step 'I should see group "Guest" in group list' do
+    page.should have_content("Guest")
+  end
+
+  step 'I should not see group "Guest" in group list' do
+    page.should_not have_content("Guest")
+  end
+
+  step 'I click new group link' do
+    click_link "New Group"
+  end
+
+  step 'submit form with new group "Samurai" info' do
+    fill_in 'group_path', with: 'Samurai'
+    fill_in 'group_description', with: 'Tokugawa Shogunate'
+    click_button "Create group"
+  end
+
+  step 'I should be redirected to group "Samurai" page' do
+    current_path.should == group_path(Group.find_by(name: 'Samurai'))
+  end
+
+  step 'I should see newly created group "Samurai"' do
+    page.should have_content "Samurai"
+    page.should have_content "Tokugawa Shogunate"
+  end
+end
diff --git a/features/steps/dashboard/issues.rb b/features/steps/dashboard/issues.rb
index 6b5f88e5895..b77113e3974 100644
--- a/features/steps/dashboard/issues.rb
+++ b/features/steps/dashboard/issues.rb
@@ -10,6 +10,7 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
 
   step 'I should see issues authored by me' do
     should_see(authored_issue)
+    should_see(authored_issue_on_public_project)
     should_not_see(assigned_issue)
     should_not_see(other_issue)
   end
@@ -22,6 +23,7 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
 
   step 'I have authored issues' do
     authored_issue
+    authored_issue_on_public_project
   end
 
   step 'I have assigned issues' do
@@ -33,14 +35,20 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
   end
 
   step 'I click "Authored by me" link' do
-    within ".scope-filter" do
-      click_link 'Created by me'
+    within ".assignee-filter" do
+      click_link "Any"
+    end
+    within ".author-filter" do
+      click_link current_user.name
     end
   end
 
   step 'I click "All" link' do
-    within ".scope-filter" do
-      click_link "Everyone's"
+    within ".author-filter" do
+      click_link "Any"
+    end
+    within ".assignee-filter" do
+      click_link "Any"
     end
   end
 
@@ -64,6 +72,10 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
     @other_issue ||= create :issue, project: project
   end
 
+  def authored_issue_on_public_project
+    @authored_issue_on_public_project ||= create :issue, author: current_user, project: public_project
+  end
+
   def project
     @project ||= begin
                    project =create :project
@@ -71,4 +83,8 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
                    project
                  end
   end
+
+  def public_project
+    @public_project ||= create :project, :public
+  end
 end
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index 95c378fa201..6261c89924c 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -4,13 +4,17 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
 
   step 'I should see merge requests assigned to me' do
     should_see(assigned_merge_request)
+    should_see(assigned_merge_request_from_fork)
     should_not_see(authored_merge_request)
+    should_not_see(authored_merge_request_from_fork)
     should_not_see(other_merge_request)
   end
 
   step 'I should see merge requests authored by me' do
     should_see(authored_merge_request)
+    should_see(authored_merge_request_from_fork)
     should_not_see(assigned_merge_request)
+    should_not_see(assigned_merge_request_from_fork)
     should_not_see(other_merge_request)
   end
 
@@ -22,10 +26,12 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
 
   step 'I have authored merge requests' do
     authored_merge_request
+    authored_merge_request_from_fork
   end
 
   step 'I have assigned merge requests' do
     assigned_merge_request
+    assigned_merge_request_from_fork
   end
 
   step 'I have other merge requests' do
@@ -33,14 +39,20 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click "Authored by me" link' do
-    within ".scope-filter" do
-      click_link 'Created by me'
+    within ".assignee-filter" do
+      click_link "Any"
+    end
+    within ".author-filter" do
+      click_link current_user.name
     end
   end
 
   step 'I click "All" link' do
-    within ".scope-filter" do
-      click_link "Everyone's"
+    within ".author-filter" do
+      click_link "Any"
+    end
+    within ".assignee-filter" do
+      click_link "Any"
     end
   end
 
@@ -53,15 +65,41 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
   end
 
   def assigned_merge_request
-    @assigned_merge_request ||= create :merge_request, assignee: current_user, target_project: project, source_project: project
+    @assigned_merge_request ||= create :merge_request,
+                                  assignee: current_user,
+                                  target_project: project,
+                                  source_project: project
   end
 
   def authored_merge_request
-    @authored_merge_request ||= create :merge_request, source_branch: 'simple_merge_request', author: current_user, target_project: project, source_project: project
+    @authored_merge_request ||= create :merge_request,
+                                  source_branch: 'simple_merge_request',
+                                  author: current_user,
+                                  target_project: project,
+                                  source_project: project
   end
 
   def other_merge_request
-    @other_merge_request ||= create :merge_request, source_branch: '2_3_notes_fix', target_project: project, source_project: project
+    @other_merge_request ||= create :merge_request,
+                              source_branch: '2_3_notes_fix',
+                              target_project: project,
+                              source_project: project
+  end
+
+  def authored_merge_request_from_fork
+    @authored_merge_request_from_fork ||= create :merge_request,
+                                            source_branch: 'basic_page',
+                                            author: current_user,
+                                            target_project: public_project,
+                                            source_project: forked_project
+  end
+
+  def assigned_merge_request_from_fork
+    @assigned_merge_request_from_fork ||= create :merge_request,
+                                            source_branch: 'basic_page_fix',
+                                            assignee: current_user,
+                                            target_project: public_project,
+                                            source_project: forked_project
   end
 
   def project
@@ -71,4 +109,12 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
                    project
                  end
   end
+
+  def public_project
+    @public_project ||= create :project, :public
+  end
+
+  def forked_project
+    @forked_project ||= Projects::ForkService.new(public_project, current_user).execute
+  end
 end
diff --git a/features/steps/dashboard/projects.rb b/features/steps/dashboard/projects.rb
deleted file mode 100644
index 2a348163060..00000000000
--- a/features/steps/dashboard/projects.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Spinach::Features::DashboardProjects < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedProject
-
-  step 'I should see projects list' do
-    @user.authorized_projects.all.each do |project|
-      page.should have_link project.name_with_namespace
-    end
-  end
-end
diff --git a/features/steps/dashboard/starred_projects.rb b/features/steps/dashboard/starred_projects.rb
new file mode 100644
index 00000000000..b9ad2f13e29
--- /dev/null
+++ b/features/steps/dashboard/starred_projects.rb
@@ -0,0 +1,15 @@
+class Spinach::Features::DashboardStarredProjects < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedPaths
+  include SharedProject
+
+  step 'I starred project "Community"' do
+    current_user.toggle_star(Project.find_by(name: 'Community'))
+  end
+
+  step 'I should not see project "Shop"' do
+    within 'aside' do
+      page.should_not have_content('Shop')
+    end
+  end
+end