Commit d819d0d1 authored by Marin Jankovski's avatar Marin Jankovski

Use the correct paths.

parent 3bcfdf07
...@@ -50,7 +50,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps ...@@ -50,7 +50,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
end end
Then 'I should see correct doc/api directory rendered' do Then 'I should see correct doc/api directory rendered' do
current_path.should == project_tree_path(@project, "master/doc/api") current_path.should == project_tree_path(@project, "master/doc/api/")
page.should have_content "README.md" page.should have_content "README.md"
page.should have_content "users.md" page.should have_content "users.md"
end end
...@@ -60,7 +60,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps ...@@ -60,7 +60,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
end end
Then 'I should see correct maintenance file rendered' do Then 'I should see correct maintenance file rendered' do
current_path.should == project_blob_path(@project, "doc/raketasks/maintenance.md") current_path.should == project_blob_path(@project, "master/doc/raketasks/maintenance.md")
page.should have_content "bundle exec rake gitlab:env:info RAILS_ENV=production" page.should have_content "bundle exec rake gitlab:env:info RAILS_ENV=production"
end end
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Gitlab::Satellite::MergeAction' do describe 'Gitlab::Satellite::MergeAction' do
before(:each) do before(:each) do
@master = ['master', 'b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828'] @master = ['master', '69b34b7e9ad9f496f0ad10250be37d6265a03bba']
@one_after_stable = ['stable', '6ea87c47f0f8a24ae031c3fff17bc913889ecd00'] #this commit sha is one after stable @one_after_stable = ['stable', '6ea87c47f0f8a24ae031c3fff17bc913889ecd00'] #this commit sha is one after stable
@wiki_branch = ['wiki', '635d3e09b72232b6e92a38de6cc184147e5bcb41'] #this is the commit sha where the wiki branch goes off from master @wiki_branch = ['wiki', '635d3e09b72232b6e92a38de6cc184147e5bcb41'] #this is the commit sha where the wiki branch goes off from master
@conflicting_metior = ['metior', '313d96e42b313a0af5ab50fa233bf43e27118b3f'] #this branch conflicts with the wiki branch @conflicting_metior = ['metior', '313d96e42b313a0af5ab50fa233bf43e27118b3f'] #this branch conflicts with the wiki branch
......
No preview for this file type
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment