Commit 40a956eb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Few more fixes after removing roles

parent cac77234
......@@ -15,9 +15,6 @@
#
class Event < ActiveRecord::Base
include NoteEvent
include PushEvent
attr_accessible :project, :action, :data, :author_id, :project_id,
:target_id, :target_type
......
......@@ -20,7 +20,7 @@
#
require Rails.root.join("app/models/commit")
require Rails.root.join("app/roles/static_model")
require Rails.root.join("lib/static_model")
class MergeRequest < ActiveRecord::Base
include IssueCommonality
......
......@@ -133,14 +133,6 @@
it { should respond_to(:path_with_namespace) }
end
describe 'modules' do
it { should include_module(Repository) }
it { should include_module(PushObserver) }
it { should include_module(Authority) }
it { should include_module(Team) }
it { should include_module(NamespacedProject) }
end
it "should return valid url to repo" do
project = Project.new(path: "somewhere")
project.url_to_repo.should == Gitlab.config.gitolite.ssh_path_prefix + "somewhere.git"
......
......@@ -65,10 +65,6 @@
it { should ensure_length_of(:bio).is_within(0..255) }
end
describe 'modules' do
it { should include_module(Account) }
end
describe "Respond to" do
it { should respond_to(:is_admin?) }
it { should respond_to(:identifier) }
......
# Stubs out all Git repository access done by models so that specs can run
# against fake repositories without Grit complaining that they don't exist.
module StubbedRepository
class Project
def path_to_repo
if new_record? || path == 'newproject'
# There are a couple Project specs and features that expect the Project's
......@@ -27,5 +27,3 @@ def create
end
end
end
Project.send(:include, StubbedRepository)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment