summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/models/project_spec.rb10
-rw-r--r--spec/requests/dashboard_spec.rb6
-rw-r--r--spec/requests/projects_spec.rb2
-rw-r--r--spec/requests/tags_spec.rb4
-rw-r--r--spec/requests/top_panel_spec.rb4
5 files changed, 11 insertions, 15 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index bd83bc805f1..cde1884a987 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -62,10 +62,10 @@ describe Project do
end
end
- describe "updates" do
+ describe "updates" do
let(:project) { Factory :project }
- before do
+ before do
@issue = Factory :issue,
:project => project,
:author => Factory(:user),
@@ -86,10 +86,10 @@ describe Project do
end
end
- describe "last_activity" do
+ describe "last_activity" do
let(:project) { Factory :project }
- before do
+ before do
@note = Factory :note,
:project => project,
:author => Factory(:user)
@@ -99,7 +99,7 @@ describe Project do
it { project.last_activity_date.to_s.should == @note.created_at.to_s }
end
- describe "fresh commits" do
+ describe "fresh commits" do
let(:project) { Factory :project }
it { project.fresh_commits(3).count.should == 3 }
diff --git a/spec/requests/dashboard_spec.rb b/spec/requests/dashboard_spec.rb
index d54c6154b55..b38630fe193 100644
--- a/spec/requests/dashboard_spec.rb
+++ b/spec/requests/dashboard_spec.rb
@@ -15,13 +15,13 @@ describe "Dashboard" do
end
it "should have projects panel" do
- within ".project-list" do
+ within ".project-list" do
page.should have_content(@project.name)
end
end
-
+
it "should have news feed" do
- within "#news-feed" do
+ within "#news-feed" do
page.should have_content("master")
page.should have_content(@project.commit.author.name)
page.should have_content(@project.commit.safe_message)
diff --git a/spec/requests/projects_spec.rb b/spec/requests/projects_spec.rb
index 85c2d27525b..97e728e5116 100644
--- a/spec/requests/projects_spec.rb
+++ b/spec/requests/projects_spec.rb
@@ -73,7 +73,7 @@ describe "Projects" do
end
it "should beahave like activities page" do
- within ".project-update" do
+ within ".project-update" do
page.should have_content("master")
page.should have_content(@project.commit.author.name)
page.should have_content(@project.commit.safe_message)
diff --git a/spec/requests/tags_spec.rb b/spec/requests/tags_spec.rb
index 94a034dabfd..ff72ab1f890 100644
--- a/spec/requests/tags_spec.rb
+++ b/spec/requests/tags_spec.rb
@@ -10,7 +10,6 @@ describe "Tags" do
# end
# end
-
describe "GET '/tags.json'" do
before do
@project = Factory :project
@@ -20,12 +19,9 @@ describe "Tags" do
visit '/tags.json'
end
-
it "should contains tags" do
page.should have_content('demo1')
end
end
-
-
end
diff --git a/spec/requests/top_panel_spec.rb b/spec/requests/top_panel_spec.rb
index a5b5a2c9b35..239671e6392 100644
--- a/spec/requests/top_panel_spec.rb
+++ b/spec/requests/top_panel_spec.rb
@@ -7,7 +7,7 @@ describe "Top Panel", :js => true do
before do
visit projects_path
fill_in "search", :with => "Ke"
- within ".ui-autocomplete" do
+ within ".ui-autocomplete" do
find(:xpath, "//a[.=\"Keys\"]").click
end
end
@@ -24,7 +24,7 @@ describe "Top Panel", :js => true do
visit project_path(@project)
fill_in "search", :with => "Commi"
- within ".ui-autocomplete" do
+ within ".ui-autocomplete" do
find(:xpath, "//a[.=\"#{@project.code} / Commits\"]").click
end
end