Download as
Browse Code »

Commit e45179c9b4d0504def48f00cfe4b97463b090614

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

remove useless routing tests. Added symlink creation for project with code

Showing 9 changed files with 18 additions and 47 deletions   Show diff stats
features/steps/project/project_fork.rb
  Diff comments   View file @e45179c
... ... @@ -10,7 +10,7 @@ class ForkProject < Spinach::FeatureSteps
10 10  
11 11 step 'I am a member of project "Shop"' do
12 12 @project = Project.find_by_name "Shop"
13   - @project ||= create(:project_with_code, name: "Shop")
  13 + @project ||= create(:project_with_code, name: "Shop", group: create(:group))
14 14 @project.team << [@user, :reporter]
15 15 end
16 16  
... ... @@ -27,4 +27,4 @@ class ForkProject &lt; Spinach::FeatureSteps
27 27 page.should have_content "Name has already been taken"
28 28 end
29 29  
30   -end
31 30 \ No newline at end of file
  31 +end
... ...
features/steps/shared/project.rb
  Diff comments   View file @e45179c
... ... @@ -3,14 +3,14 @@ module SharedProject
3 3  
4 4 # Create a project without caring about what it's called
5 5 And "I own a project" do
6   - @project = create(:project_with_code)
  6 + @project = create(:project_with_code, namespace: @user.namespace)
7 7 @project.team << [@user, :master]
8 8 end
9 9  
10 10 # Create a specific project called "Shop"
11 11 And 'I own project "Shop"' do
12 12 @project = Project.find_by_name "Shop"
13   - @project ||= create(:project_with_code, name: "Shop")
  13 + @project ||= create(:project_with_code, name: "Shop", namespace: @user.namespace)
14 14 @project.team << [@user, :master]
15 15 end
16 16  
... ...
spec/factories.rb
  Diff comments   View file @e45179c
... ... @@ -36,6 +36,13 @@ FactoryGirl.define do
36 36  
37 37 factory :project_with_code, parent: :project do
38 38 path { 'gitlabhq' }
  39 +
  40 + after :create do |project|
  41 + repos_path = Rails.root.join('tmp', 'test-git-base-path')
  42 + seed_repo = Rails.root.join('tmp', 'repositories', 'gitlabhq')
  43 + target_repo = File.join(repos_path, project.path_with_namespace + '.git')
  44 + system("ln -s #{seed_repo} #{target_repo}")
  45 + end
39 46 end
40 47  
41 48 factory :group do
... ...
spec/features/search_spec.rb
  Diff comments   View file @e45179c
... ... @@ -2,8 +2,9 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe "Search" do
4 4 before do
  5 + ActiveRecord::Base.observers.enable(:user_observer)
5 6 login_as :user
6   - @project = create(:project)
  7 + @project = create(:project, namespace: @user.namespace)
7 8 @project.team << [@user, :reporter]
8 9 visit search_path
9 10  
... ...
spec/requests/api/projects_spec.rb
  Diff comments   View file @e45179c
... ... @@ -8,7 +8,7 @@ describe API::API do
8 8 let(:user2) { create(:user) }
9 9 let(:user3) { create(:user) }
10 10 let(:admin) { create(:admin) }
11   - let!(:project) { create(:project_with_code, creator_id: user.id) }
  11 + let!(:project) { create(:project_with_code, creator_id: user.id, namespace: user.namespace) }
12 12 let!(:hook) { create(:project_hook, project: project, url: "http://example.com") }
13 13 let!(:snippet) { create(:project_snippet, author: user, project: project, title: 'example') }
14 14 let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
... ...
spec/routing/admin_routing_spec.rb
  Diff comments   View file @e45179c
... ... @@ -75,18 +75,8 @@ describe Admin::ProjectsController, &quot;routing&quot; do
75 75 end
76 76 end
77 77  
78   -# edit_admin_project_member GET /admin/projects/:project_id/members/:id/edit(.:format) admin/projects/members#edit {id: /[^\/]+/, project_id: /[^\/]+/}
79   -# admin_project_member PUT /admin/projects/:project_id/members/:id(.:format) admin/projects/members#update {id: /[^\/]+/, project_id: /[^\/]+/}
80 78 # DELETE /admin/projects/:project_id/members/:id(.:format) admin/projects/members#destroy {id: /[^\/]+/, project_id: /[^\/]+/}
81 79 describe Admin::Projects::MembersController, "routing" do
82   - it "to #edit" do
83   - get("/admin/projects/test/members/1/edit").should route_to('admin/projects/members#edit', project_id: 'test', id: '1')
84   - end
85   -
86   - it "to #update" do
87   - put("/admin/projects/test/members/1").should route_to('admin/projects/members#update', project_id: 'test', id: '1')
88   - end
89   -
90 80 it "to #destroy" do
91 81 delete("/admin/projects/test/members/1").should route_to('admin/projects/members#destroy', project_id: 'test', id: '1')
92 82 end
... ...
spec/routing/project_routing_spec.rb
  Diff comments   View file @e45179c
... ... @@ -124,12 +124,7 @@ end
124 124 # branches_project_repository GET /:project_id/repository/branches(.:format) repositories#branches
125 125 # tags_project_repository GET /:project_id/repository/tags(.:format) repositories#tags
126 126 # archive_project_repository GET /:project_id/repository/archive(.:format) repositories#archive
127   -# project_repository POST /:project_id/repository(.:format) repositories#create
128   -# new_project_repository GET /:project_id/repository/new(.:format) repositories#new
129 127 # edit_project_repository GET /:project_id/repository/edit(.:format) repositories#edit
130   -# GET /:project_id/repository(.:format) repositories#show
131   -# PUT /:project_id/repository(.:format) repositories#update
132   -# DELETE /:project_id/repository(.:format) repositories#destroy
133 128 describe RepositoriesController, "routing" do
134 129 it "to #branches" do
135 130 get("/gitlabhq/repository/branches").should route_to('repositories#branches', project_id: 'gitlabhq')
... ... @@ -143,29 +138,9 @@ describe RepositoriesController, &quot;routing&quot; do
143 138 get("/gitlabhq/repository/archive").should route_to('repositories#archive', project_id: 'gitlabhq')
144 139 end
145 140  
146   - it "to #create" do
147   - post("/gitlabhq/repository").should route_to('repositories#create', project_id: 'gitlabhq')
148   - end
149   -
150   - it "to #new" do
151   - get("/gitlabhq/repository/new").should route_to('repositories#new', project_id: 'gitlabhq')
152   - end
153   -
154   - it "to #edit" do
155   - get("/gitlabhq/repository/edit").should route_to('repositories#edit', project_id: 'gitlabhq')
156   - end
157   -
158 141 it "to #show" do
159 142 get("/gitlabhq/repository").should route_to('repositories#show', project_id: 'gitlabhq')
160 143 end
161   -
162   - it "to #update" do
163   - put("/gitlabhq/repository").should route_to('repositories#update', project_id: 'gitlabhq')
164   - end
165   -
166   - it "to #destroy" do
167   - delete("/gitlabhq/repository").should route_to('repositories#destroy', project_id: 'gitlabhq')
168   - end
169 144 end
170 145  
171 146 # project_deploy_keys GET /:project_id/deploy_keys(.:format) deploy_keys#index
... ...
spec/support/login_helpers.rb
  Diff comments   View file @e45179c
... ... @@ -3,7 +3,10 @@ module LoginHelpers
3 3 #
4 4 # role - User role (e.g., :admin, :user)
5 5 def login_as(role)
6   - @user = create(role)
  6 + ActiveRecord::Base.observers.enable(:user_observer) do
  7 + @user = create(role)
  8 + end
  9 +
7 10 login_with(@user)
8 11 end
9 12  
... ...
spec/support/test_env.rb
  Diff comments   View file @e45179c
... ... @@ -65,11 +65,6 @@ module TestEnv
65 65  
66 66 # Recreate tmp/test-git-base-path
67 67 FileUtils.mkdir_p Gitlab.config.gitlab_shell.repos_path
68   -
69   - # Symlink tmp/repositories/gitlabhq to tmp/test-git-base-path/gitlabhq
70   - seed_repo = Rails.root.join('tmp', 'repositories', 'gitlabhq')
71   - target_repo = File.join(repos_path, 'gitlabhq.git')
72   - system("ln -s #{seed_repo} #{target_repo}")
73 68 end
74 69  
75 70 def create_temp_repo(path)
... ...