Download as
Browse Code »

Commit 95791316f4037273af7b747ce1851d5f4e46933f

Authored by Dmitriy Zaporozhets
1 parent e45179c9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Lets fix tests

Showing 5 changed files with 14 additions and 9 deletions   Show diff stats
app/views/snippets/_snippets.html.haml
  Diff comments   View file @9579131
1 1 %ul.bordered-list
2   - = render @snippets
  2 + = render partial: 'snippet', collection: @snippets
3 3 - if @snippets.empty?
4 4 %li
5 5 %h3.nothing_here_message Nothing here.
... ...
features/project/team_management.feature
  Diff comments   View file @9579131
... ... @@ -31,6 +31,7 @@ Feature: Project Team management
31 31 Scenario: Import team from another project
32 32 Given I own project "Website"
33 33 And "Mike" is "Website" reporter
  34 + When I visit project "Shop" team page
34 35 And I click link "Import team from another project"
35   - When I submit "Website" project for import team
  36 + And I submit "Website" project for import team
36 37 Then I should see "Mike" in team list as "Reporter"
... ...
features/steps/dashboard/dashboard.rb
  Diff comments   View file @9579131
... ... @@ -29,7 +29,7 @@ class Dashboard < Spinach::FeatureSteps
29 29  
30 30 Given 'user with name "John Doe" joined project "Shop"' do
31 31 user = create(:user, {name: "John Doe"})
32   - project = Project.find_by_name "Shop"
  32 + project.team << [user, :master]
33 33 Event.create(
34 34 project: project,
35 35 author_id: user.id,
... ... @@ -38,12 +38,11 @@ class Dashboard &lt; Spinach::FeatureSteps
38 38 end
39 39  
40 40 Then 'I should see "John Doe joined project at Shop" event' do
41   - page.should have_content "John Doe joined project at Shop"
  41 + page.should have_content "John Doe joined project at #{project.name_with_namespace}"
42 42 end
43 43  
44 44 And 'user with name "John Doe" left project "Shop"' do
45 45 user = User.find_by_name "John Doe"
46   - project = Project.find_by_name "Shop"
47 46 Event.create(
48 47 project: project,
49 48 author_id: user.id,
... ... @@ -52,7 +51,7 @@ class Dashboard &lt; Spinach::FeatureSteps
52 51 end
53 52  
54 53 Then 'I should see "John Doe left project at Shop" event' do
55   - page.should have_content "John Doe left project at Shop"
  54 + page.should have_content "John Doe left project at #{project.name_with_namespace}"
56 55 end
57 56  
58 57 And 'I have group with projects' do
... ... @@ -83,4 +82,8 @@ class Dashboard &lt; Spinach::FeatureSteps
83 82 Then 'I should see 1 project at group list' do
84 83 page.find('span.last_activity/span').should have_content('1')
85 84 end
  85 +
  86 + def project
  87 + @project ||= Project.find_by_name "Shop"
  88 + end
86 89 end
... ...
features/steps/project/project_team_management.rb
  Diff comments   View file @9579131
... ... @@ -79,7 +79,7 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
79 79 end
80 80  
81 81 Given 'I own project "Website"' do
82   - @project = create(:project, name: "Website")
  82 + @project = create(:project, name: "Website", namespace: @user.namespace)
83 83 @project.team << [@user, :master]
84 84 end
85 85  
... ... @@ -94,7 +94,8 @@ class ProjectTeamManagement &lt; Spinach::FeatureSteps
94 94 end
95 95  
96 96 When 'I submit "Website" project for import team' do
97   - select 'Website', from: 'source_project_id'
  97 + project = Project.find_by_name("Website")
  98 + select project.name_with_namespace, from: 'source_project_id'
98 99 click_button 'Import'
99 100 end
100 101  
... ...
features/steps/shared/project.rb
  Diff comments   View file @9579131
... ... @@ -42,7 +42,7 @@ module SharedProject
42 42  
43 43 Then 'I should see project "Shop" activity feed' do
44 44 project = Project.find_by_name("Shop")
45   - page.should have_content "#{@user.name} pushed new branch new_design at #{project.name}"
  45 + page.should have_content "#{@user.name} pushed new branch new_design at #{project.name_with_namespace}"
46 46 end
47 47  
48 48 Then 'I should see project settings' do
... ...