Download as
Browse Code »

Commit 37187336b1ae92751d98f33d1f378aac069ecdaa

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

Team features are green now

Showing 7 changed files with 21 additions and 21 deletions   Show diff stats
features/project/source/browse_files.feature
  Diff comments   View file @3718733
@@ -12,7 +12,7 @@ Feature: Project Browse files @@ -12,7 +12,7 @@ Feature: Project Browse files
12 Then I should see files from repository for "8470d70" 12 Then I should see files from repository for "8470d70"
13 13
14 Scenario: I browse file content 14 Scenario: I browse file content
15 - Given I click on "Gemfile" file in repo 15 + Given I click on "Gemfile.lock" file in repo
16 Then I should see it content 16 Then I should see it content
17 17
18 Scenario: I browse raw file 18 Scenario: I browse raw file
@@ -22,6 +22,6 @@ Feature: Project Browse files @@ -22,6 +22,6 @@ Feature: Project Browse files
22 22
23 @javascript 23 @javascript
24 Scenario: I can edit file 24 Scenario: I can edit file
25 - Given I click on "Gemfile" file in repo 25 + Given I click on "Gemfile.lock" file in repo
26 And I click button "edit" 26 And I click button "edit"
27 Then I can edit code 27 Then I can edit code
features/project/source/git_blame.feature
  Diff comments   View file @3718733
@@ -5,6 +5,6 @@ Feature: Project Browse git repo @@ -5,6 +5,6 @@ Feature: Project Browse git repo
5 Given I visit project source page 5 Given I visit project source page
6 6
7 Scenario: I blame file 7 Scenario: I blame file
8 - Given I click on "Gemfile" file in repo 8 + Given I click on "Gemfile.lock" file in repo
9 And I click blame button 9 And I click blame button
10 Then I should see git file blame 10 Then I should see git file blame
features/steps/admin/admin_teams.rb
  Diff comments   View file @3718733
@@ -9,7 +9,7 @@ class AdminTeams < Spinach::FeatureSteps @@ -9,7 +9,7 @@ class AdminTeams < Spinach::FeatureSteps
9 end 9 end
10 10
11 And 'Create gitlab user "John"' do 11 And 'Create gitlab user "John"' do
12 - @user = create(:user, :name => "John") 12 + @user = create(:user, name: "John")
13 end 13 end
14 14
15 And 'I click new team link' do 15 And 'I click new team link' do
@@ -50,8 +50,8 @@ class AdminTeams < Spinach::FeatureSteps @@ -50,8 +50,8 @@ class AdminTeams < Spinach::FeatureSteps
50 When 'I select user "John" from user list as "Developer"' do 50 When 'I select user "John" from user list as "Developer"' do
51 @user ||= User.find_by_name("John") 51 @user ||= User.find_by_name("John")
52 within "#team_members" do 52 within "#team_members" do
53 - select @user.name, :from => "user_ids"  
54 - select "Developer", :from => "default_project_access" 53 + select "#{@user.name} (#{@user.email})", from: "user_ids"
  54 + select "Developer", from: "default_project_access"
55 end 55 end
56 end 56 end
57 57
@@ -89,8 +89,8 @@ class AdminTeams < Spinach::FeatureSteps @@ -89,8 +89,8 @@ class AdminTeams < Spinach::FeatureSteps
89 When 'I select project "Shop" with max access "Reporter"' do 89 When 'I select project "Shop" with max access "Reporter"' do
90 @project ||= Project.find_by_name("Shop") 90 @project ||= Project.find_by_name("Shop")
91 within "#assign_projects" do 91 within "#assign_projects" do
92 - select @project.name, :from => "project_ids"  
93 - select "Reporter", :from => "greatest_project_access" 92 + select @project.name, from: "project_ids"
  93 + select "Reporter", from: "greatest_project_access"
94 end 94 end
95 95
96 end 96 end
@@ -127,8 +127,8 @@ class AdminTeams < Spinach::FeatureSteps @@ -127,8 +127,8 @@ class AdminTeams < Spinach::FeatureSteps
127 When 'I select user "Jimm" ub team members list as "Master"' do 127 When 'I select user "Jimm" ub team members list as "Master"' do
128 user = User.find_by_name("Jimm") 128 user = User.find_by_name("Jimm")
129 within "#team_members" do 129 within "#team_members" do
130 - select user.name, :from => "user_ids"  
131 - select "Developer", :from => "default_project_access" 130 + select "#{user.name} (#{user.email})", from: "user_ids"
  131 + select "Developer", from: "default_project_access"
132 end 132 end
133 end 133 end
134 134
features/steps/project/project_browse_files.rb
  Diff comments   View file @3718733
@@ -16,12 +16,12 @@ class ProjectBrowseFiles < Spinach::FeatureSteps @@ -16,12 +16,12 @@ class ProjectBrowseFiles < Spinach::FeatureSteps
16 page.should have_content "Gemfile" 16 page.should have_content "Gemfile"
17 end 17 end
18 18
19 - Given 'I click on "Gemfile" file in repo' do  
20 - click_link "Gemfile" 19 + Given 'I click on "Gemfile.lock" file in repo' do
  20 + click_link "Gemfile.lock"
21 end 21 end
22 22
23 Then 'I should see it content' do 23 Then 'I should see it content' do
24 - page.should have_content "rubygems.org" 24 + page.should have_content "DEPENDENCIES"
25 end 25 end
26 26
27 And 'I click link "raw"' do 27 And 'I click link "raw"' do
features/steps/project/project_browse_git_repo.rb
  Diff comments   View file @3718733
@@ -3,8 +3,8 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps @@ -3,8 +3,8 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps
3 include SharedProject 3 include SharedProject
4 include SharedPaths 4 include SharedPaths
5 5
6 - Given 'I click on "Gemfile" file in repo' do  
7 - click_link "Gemfile" 6 + Given 'I click on "Gemfile.lock" file in repo' do
  7 + click_link "Gemfile.lock"
8 end 8 end
9 9
10 And 'I click blame button' do 10 And 'I click blame button' do
@@ -12,7 +12,7 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps @@ -12,7 +12,7 @@ class ProjectBrowseGitRepo < Spinach::FeatureSteps
12 end 12 end
13 13
14 Then 'I should see git file blame' do 14 Then 'I should see git file blame' do
15 - page.should have_content "rubygems.org" 15 + page.should have_content "DEPENDENCIES"
16 page.should have_content "Dmitriy Zaporozhets" 16 page.should have_content "Dmitriy Zaporozhets"
17 page.should have_content "Moving to rails 3.2" 17 page.should have_content "Moving to rails 3.2"
18 end 18 end
features/steps/userteams/userteams.rb
  Diff comments   View file @3718733
@@ -177,8 +177,8 @@ class Userteams < Spinach::FeatureSteps @@ -177,8 +177,8 @@ class Userteams < Spinach::FeatureSteps
177 And 'I select user "John" from list with role "Reporter"' do 177 And 'I select user "John" from list with role "Reporter"' do
178 user = User.find_by_name("John") 178 user = User.find_by_name("John")
179 within "#team_members" do 179 within "#team_members" do
180 - select user.name, :from => "user_ids"  
181 - select "Reporter", :from => "default_project_access" 180 + select "#{user.name} (#{user.email})", from: "user_ids"
  181 + select "Reporter", from: "default_project_access"
182 end 182 end
183 click_button "Add" 183 click_button "Add"
184 end 184 end
@@ -213,8 +213,8 @@ class Userteams < Spinach::FeatureSteps @@ -213,8 +213,8 @@ class Userteams < Spinach::FeatureSteps
213 213
214 When 'I submit form with selected project and max access' do 214 When 'I submit form with selected project and max access' do
215 within "#assign_projects" do 215 within "#assign_projects" do
216 - select @project.name_with_namespace, :from => "project_ids"  
217 - select "Reporter", :from => "greatest_project_access" 216 + select @project.name_with_namespace, from: "project_ids"
  217 + select "Reporter", from: "greatest_project_access"
218 end 218 end
219 click_button "Add" 219 click_button "Add"
220 end 220 end
spec/support/stubbed_repository.rb
  Diff comments   View file @3718733
@@ -34,7 +34,7 @@ class Project @@ -34,7 +34,7 @@ class Project
34 end 34 end
35 35
36 class MergeRequest 36 class MergeRequest
37 - def can_be_merged 37 + def check_if_can_be_merged
38 true 38 true
39 end 39 end
40 end 40 end