summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-05 23:49:01 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-05 23:49:01 +0200
commitbaf591cc2793533e524810c14afc76b5fe5126f7 (patch)
treee8b6b87655e4a6ac54392dc9d2775eda069052b8
parent031008648f3c2ffb860c39899398dceb395d2948 (diff)
downloadgitlab-ce-baf591cc2793533e524810c14afc76b5fe5126f7.tar.gz
Fix network test and snippets expired
-rw-r--r--app/controllers/snippets_controller.rb2
-rw-r--r--features/steps/project/project_network_graph.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index d037ad11ef1..119ef9b2be3 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -16,7 +16,7 @@ class SnippetsController < ProjectResourceController
respond_to :html
def index
- @snippets = @project.snippets.fresh
+ @snippets = @project.snippets.fresh.non_expired
end
def new
diff --git a/features/steps/project/project_network_graph.rb b/features/steps/project/project_network_graph.rb
index 6fde532f1a2..77149bfe2c3 100644
--- a/features/steps/project/project_network_graph.rb
+++ b/features/steps/project/project_network_graph.rb
@@ -6,7 +6,6 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
page.should have_content "Project Network Graph"
within ".graph" do
page.should have_content "master"
- page.should have_content "scss_refactor..."
end
end