dashboard v1

4 files changed, 62 insertions, 58 deletions

diff --git a/spec/requests/dashboard_issues_spec.rb b/spec/requests/dashboard_issues_spec.rb
new file mode 100644
index 00000000000..b9304512457
--- /dev/null
+++ b/spec/requests/dashboard_issues_spec.rb
@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "User Issues Dashboard", :js => true do
+  describe "GET /issues" do
+    before do
+
+      login_as :user
+
+      @project1 = Factory :project,
+        :path => "project1",
+        :code => "TEST1"
+
+      @project2 = Factory :project,
+        :path => "project2",
+        :code => "TEST2"
+
+      @project1.add_access(@user, :read, :write)
+      @project2.add_access(@user, :read, :write)
+
+      @issue1 = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => @project1
+
+      @issue2 = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => @project2
+
+      visit dashboard_path
+      click_link "issues_slide"
+    end
+
+    subject { page }
+
+    it { should have_content(@issue1.title[0..10]) }
+    it { should have_content(@issue1.project.name) }
+    it { should have_content(@issue1.assignee.name) }
+
+    it { should have_content(@issue2.title[0..10]) }
+    it { should have_content(@issue2.project.name) }
+    it { should have_content(@issue2.assignee.name) }
+
+    describe "atom feed", :js => false do
+      it "should render atom feed via private token" do
+        logout
+        visit dashboard_issues_path(:atom, :private_token => @user.private_token)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", :text => "#{@user.name} issues")
+        page.body.should have_selector("author email", :text => @issue1.author_email)
+        page.body.should have_selector("entry summary", :text => @issue1.title)
+        page.body.should have_selector("author email", :text => @issue2.author_email)
+        page.body.should have_selector("entry summary", :text => @issue2.title)
+      end
+    end
+  end
+end
diff --git a/spec/requests/user_merge_requests_spec.rb b/spec/requests/dashboard_merge_requests_spec.rb
index fb47f3dd4ab..2706497044b 100644
--- a/spec/requests/user_merge_requests_spec.rb
+++ b/spec/requests/dashboard_merge_requests_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "User MergeRequests" do
+describe "User MergeRequests", :js => true do
   describe "GET /issues" do
     before do
 
@@ -27,7 +27,8 @@ describe "User MergeRequests" do
         :assignee => @user,
         :project => @project2
 
-      visit merge_requests_path
+      visit dashboard_path
+      click_link "merge_requests_slide"
     end
 
     subject { page }
diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb
index 29dc473939f..a2ad68d0cb9 100644
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
@@ -23,7 +23,7 @@ describe "Issues" do
 
     subject { page }
 
-    it { should have_content(@issue.title) }
+    it { should have_content(@issue.title[0..20]) }
     it { should have_content(@issue.project.name) }
     it { should have_content(@issue.assignee.name) }
 
diff --git a/spec/requests/user_issues_spec.rb b/spec/requests/user_issues_spec.rb
deleted file mode 100644
index bd29eae303d..00000000000
--- a/spec/requests/user_issues_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe "User Issues Dashboard" do
-  describe "GET /issues" do
-    before do
-
-      login_as :user
-
-      @project1 = Factory :project,
-        :path => "project1",
-        :code => "TEST1"
-
-      @project2 = Factory :project,
-        :path => "project2",
-        :code => "TEST2"
-
-      @project1.add_access(@user, :read, :write)
-      @project2.add_access(@user, :read, :write)
-
-      @issue1 = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => @project1
-
-      @issue2 = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => @project2
-
-      visit issues_path
-    end
-
-    subject { page }
-
-    it { should have_content(@issue1.title) }
-    it { should have_content(@issue1.project.name) }
-    it { should have_content(@issue1.assignee.name) }
-
-    it { should have_content(@issue2.title) }
-    it { should have_content(@issue2.project.name) }
-    it { should have_content(@issue2.assignee.name) }
-
-    it "should render atom feed via private token" do
-      logout
-      visit issues_path(:atom, :private_token => @user.private_token)
-
-      page.response_headers['Content-Type'].should have_content("application/atom+xml")
-      page.body.should have_selector("title", :text => "#{@user.name} issues")
-      page.body.should have_selector("author email", :text => @issue1.author_email)
-      page.body.should have_selector("entry summary", :text => @issue1.title)
-      page.body.should have_selector("author email", :text => @issue2.author_email)
-      page.body.should have_selector("entry summary", :text => @issue2.title)
-    end
-  end
-end