Download as
Browse Code »

Commit 40a956eb6825f2bbca06e9f24c1fb24dc71a1ecd

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

Few more fixes after removing roles

Showing 5 changed files with 2 additions and 19 deletions   Show diff stats
app/models/event.rb
  Diff comments   View file @40a956e
... ... @@ -15,9 +15,6 @@
15 15 #
16 16  
17 17 class Event < ActiveRecord::Base
18   - include NoteEvent
19   - include PushEvent
20   -
21 18 attr_accessible :project, :action, :data, :author_id, :project_id,
22 19 :target_id, :target_type
23 20  
... ...
app/models/merge_request.rb
  Diff comments   View file @40a956e
... ... @@ -20,7 +20,7 @@
20 20 #
21 21  
22 22 require Rails.root.join("app/models/commit")
23   -require Rails.root.join("app/roles/static_model")
  23 +require Rails.root.join("lib/static_model")
24 24  
25 25 class MergeRequest < ActiveRecord::Base
26 26 include IssueCommonality
... ...
spec/models/project_spec.rb
  Diff comments   View file @40a956e
... ... @@ -133,14 +133,6 @@ describe Project do
133 133 it { should respond_to(:path_with_namespace) }
134 134 end
135 135  
136   - describe 'modules' do
137   - it { should include_module(Repository) }
138   - it { should include_module(PushObserver) }
139   - it { should include_module(Authority) }
140   - it { should include_module(Team) }
141   - it { should include_module(NamespacedProject) }
142   - end
143   -
144 136 it "should return valid url to repo" do
145 137 project = Project.new(path: "somewhere")
146 138 project.url_to_repo.should == Gitlab.config.gitolite.ssh_path_prefix + "somewhere.git"
... ...
spec/models/user_spec.rb
  Diff comments   View file @40a956e
... ... @@ -65,10 +65,6 @@ describe User do
65 65 it { should ensure_length_of(:bio).is_within(0..255) }
66 66 end
67 67  
68   - describe 'modules' do
69   - it { should include_module(Account) }
70   - end
71   -
72 68 describe "Respond to" do
73 69 it { should respond_to(:is_admin?) }
74 70 it { should respond_to(:identifier) }
... ...
spec/support/stubbed_repository.rb
  Diff comments   View file @40a956e
1 1 # Stubs out all Git repository access done by models so that specs can run
2 2 # against fake repositories without Grit complaining that they don't exist.
3   -module StubbedRepository
  3 +class Project
4 4 def path_to_repo
5 5 if new_record? || path == 'newproject'
6 6 # There are a couple Project specs and features that expect the Project's
... ... @@ -27,5 +27,3 @@ module StubbedRepository
27 27 end
28 28 end
29 29 end
30   -
31   -Project.send(:include, StubbedRepository)
... ...