Commit d819d0d1f84946bcc0d2c871682c220db6dbd478
1 parent
3bcfdf07
Exists in
spb-stable
and in
3 other branches
Use the correct paths.
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
features/steps/project/project_markdown_render.rb
| @@ -50,7 +50,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps | @@ -50,7 +50,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps | ||
| 50 | end | 50 | end |
| 51 | 51 | ||
| 52 | Then 'I should see correct doc/api directory rendered' do | 52 | Then 'I should see correct doc/api directory rendered' do |
| 53 | - current_path.should == project_tree_path(@project, "master/doc/api") | 53 | + current_path.should == project_tree_path(@project, "master/doc/api/") |
| 54 | page.should have_content "README.md" | 54 | page.should have_content "README.md" |
| 55 | page.should have_content "users.md" | 55 | page.should have_content "users.md" |
| 56 | end | 56 | end |
| @@ -60,7 +60,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps | @@ -60,7 +60,7 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps | ||
| 60 | end | 60 | end |
| 61 | 61 | ||
| 62 | Then 'I should see correct maintenance file rendered' do | 62 | Then 'I should see correct maintenance file rendered' do |
| 63 | - current_path.should == project_blob_path(@project, "doc/raketasks/maintenance.md") | 63 | + current_path.should == project_blob_path(@project, "master/doc/raketasks/maintenance.md") |
| 64 | page.should have_content "bundle exec rake gitlab:env:info RAILS_ENV=production" | 64 | page.should have_content "bundle exec rake gitlab:env:info RAILS_ENV=production" |
| 65 | end | 65 | end |
| 66 | 66 |
spec/lib/gitlab/satellite/merge_action_spec.rb
| @@ -2,7 +2,7 @@ require 'spec_helper' | @@ -2,7 +2,7 @@ require 'spec_helper' | ||
| 2 | 2 | ||
| 3 | describe 'Gitlab::Satellite::MergeAction' do | 3 | describe 'Gitlab::Satellite::MergeAction' do |
| 4 | before(:each) do | 4 | before(:each) do |
| 5 | - @master = ['master', 'b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828'] | 5 | + @master = ['master', '69b34b7e9ad9f496f0ad10250be37d6265a03bba'] |
| 6 | @one_after_stable = ['stable', '6ea87c47f0f8a24ae031c3fff17bc913889ecd00'] #this commit sha is one after stable | 6 | @one_after_stable = ['stable', '6ea87c47f0f8a24ae031c3fff17bc913889ecd00'] #this commit sha is one after stable |
| 7 | @wiki_branch = ['wiki', '635d3e09b72232b6e92a38de6cc184147e5bcb41'] #this is the commit sha where the wiki branch goes off from master | 7 | @wiki_branch = ['wiki', '635d3e09b72232b6e92a38de6cc184147e5bcb41'] #this is the commit sha where the wiki branch goes off from master |
| 8 | @conflicting_metior = ['metior', '313d96e42b313a0af5ab50fa233bf43e27118b3f'] #this branch conflicts with the wiki branch | 8 | @conflicting_metior = ['metior', '313d96e42b313a0af5ab50fa233bf43e27118b3f'] #this branch conflicts with the wiki branch |
spec/seed_project.tar.gz
No preview for this file type