diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-05 00:43:32 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-05 00:43:32 +0200 |
commit | 9a88e4d184e5959cb3b7212d027ae4bbe1c97302 (patch) | |
tree | f32cbc1a70e94d9d61137504e48e6dd54b22269b /spec/requests | |
parent | e16cebac3eaadc0df93576358f60ae4a498ce15f (diff) | |
download | gitlab-ce-9a88e4d184e5959cb3b7212d027ae4bbe1c97302.tar.gz |
Fix some tests. Use travis-ci 1.9.2
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/security/project_access_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/requests/security/project_access_spec.rb b/spec/requests/security/project_access_spec.rb index 060a276b740..3aee8ba1de4 100644 --- a/spec/requests/security/project_access_spec.rb +++ b/spec/requests/security/project_access_spec.rb @@ -22,10 +22,10 @@ describe "Application access" do before do # full access - project.users_projects.create(user: master, project_access: UsersProject::MASTER) + project.team << [master, :master] # readonly - project.users_projects.create(user: reporter, project_access: UsersProject::REPORTER) + project.team << [reporter, :reporter] end describe "GET /project_code" do @@ -62,7 +62,7 @@ describe "Application access" do end describe "GET /project_code/commit/:sha" do - subject { project_commit_path(project, project.commit) } + subject { project_commit_path(project, project.repository.commit) } it { should be_allowed_for master } it { should be_allowed_for reporter } @@ -107,7 +107,7 @@ describe "Application access" do describe "GET /project_code/blob" do before do - commit = project.commit + commit = project.repository.commit path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name @blob_path = project_blob_path(project, File.join(commit.id, path)) end |