Commit 422236c7 authored by Robert Speicher's avatar Robert Speicher
Browse files

Change `foo.should` syntax to `expect(foo).to` in specs

parent 651f731cd58f
......@@ -15,9 +15,9 @@
let(:body) { JSON.parse(response.body) }
it { body.should be_kind_of(Array) }
it { body.size.should eq(1) }
it { body.first["username"].should == user.username }
it { expect(body).to be_kind_of(Array) }
it { expect(body.size).to eq(1) }
it { expect(body.first["username"]).to eq user.username }
end
context 'group members' do
......@@ -32,9 +32,9 @@
let(:body) { JSON.parse(response.body) }
it { body.should be_kind_of(Array) }
it { body.size.should eq(1) }
it { body.first["username"].should == user.username }
it { expect(body).to be_kind_of(Array) }
it { expect(body.size).to eq(1) }
it { expect(body.first["username"]).to eq user.username }
end
context 'all users' do
......@@ -45,7 +45,7 @@
let(:body) { JSON.parse(response.body) }
it { body.should be_kind_of(Array) }
it { body.size.should eq(User.count) }
it { expect(body).to be_kind_of(Array) }
it { expect(body.size).to eq(User.count) }
end
end
......@@ -90,7 +90,7 @@
#within(".current-note-edit-form") do
#fill_in "note[note]", with: "Some new content"
#find(".btn-cancel").click
#find(".js-note-text", visible: false).text.should == note.note
#expect(find(".js-note-text", visible: false).text).to eq note.note
#end
#end
......
......@@ -23,7 +23,7 @@
it "should block user in GitLab" do
access.allowed?
user.should be_blocked
expect(user).to be_blocked
end
end
......@@ -44,7 +44,7 @@
it "does not unblock user in GitLab" do
access.allowed?
user.should be_blocked
expect(user).to be_blocked
end
end
......
......@@ -80,31 +80,31 @@
context 'auth_hash constructed with ASCII-8BIT encoding' do
it 'forces utf8 encoding on uid' do
auth_hash.uid.encoding.should eql Encoding::UTF_8
expect(auth_hash.uid.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on provider' do
auth_hash.provider.encoding.should eql Encoding::UTF_8
expect(auth_hash.provider.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on name' do
auth_hash.name.encoding.should eql Encoding::UTF_8
expect(auth_hash.name.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on full_name' do
auth_hash.full_name.encoding.should eql Encoding::UTF_8
expect(auth_hash.full_name.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on username' do
auth_hash.username.encoding.should eql Encoding::UTF_8
expect(auth_hash.username.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on email' do
auth_hash.email.encoding.should eql Encoding::UTF_8
expect(auth_hash.email.encoding).to eql Encoding::UTF_8
end
it 'forces utf8 encoding on password' do
auth_hash.password.encoding.should eql Encoding::UTF_8
expect(auth_hash.password.encoding).to eql Encoding::UTF_8
end
end
end
......@@ -52,7 +52,7 @@
it 'should replace the wiki url' do
wiki_path = get_project_wiki_path(project)
wiki_path.should match('https://gitlab.com')
expect(wiki_path).to match('https://gitlab.com')
end
end
end
......
......@@ -51,7 +51,7 @@
let(:_recipients) { 'a b c' }
it 'should not add an error if there is 3 recipients' do
subject.send :check_recipients_count
subject.errors.should be_blank
expect(subject.errors).to be_blank
end
end
end
......@@ -96,11 +96,11 @@
conn = @irker_server.accept
conn.readlines.each do |line|
msg = JSON.load(line.chomp("\n"))
msg.keys.should match_array(['to', 'privmsg'])
expect(msg.keys).to match_array(['to', 'privmsg'])
if msg['to'].is_a?(String)
msg['to'].should == 'irc://chat.freenode.net/#commits'
expect(msg['to']).to eq 'irc://chat.freenode.net/#commits'
else
msg['to'].should match_array(['irc://chat.freenode.net/#commits'])
expect(msg['to']).to match_array(['irc://chat.freenode.net/#commits'])
end
end
conn.close
......
......@@ -196,10 +196,10 @@
it 'should return a project issue by iid' do
get api("/projects/#{project.id}/issues?iid=#{issue.iid}", user)
response.status.should == 200
json_response.first['title'].should == issue.title
json_response.first['id'].should == issue.id
json_response.first['iid'].should == issue.iid
expect(response.status).to eq 200
expect(json_response.first['title']).to eq issue.title
expect(json_response.first['id']).to eq issue.id
expect(json_response.first['iid']).to eq issue.iid
end
it "should return 404 if issue id not found" do
......
......@@ -118,9 +118,9 @@
it 'should return merge_request by iid' do
url = "/projects/#{project.id}/merge_requests?iid=#{merge_request.iid}"
get api(url, user)
response.status.should == 200
json_response.first['title'].should == merge_request.title
json_response.first['id'].should == merge_request.id
expect(response.status).to eq 200
expect(json_response.first['title']).to eq merge_request.title
expect(json_response.first['id']).to eq merge_request.id
end
it "should return a 404 error if merge_request_id not found" do
......
......@@ -32,9 +32,9 @@
it 'should return a project milestone by iid' do
get api("/projects/#{project.id}/milestones?iid=#{milestone.iid}", user)
response.status.should == 200
json_response.first['title'].should == milestone.title
json_response.first['id'].should == milestone.id
expect(response.status).to eq 200
expect(json_response.first['title']).to eq milestone.title
expect(json_response.first['id']).to eq milestone.id
end
it 'should return 401 error if user not authenticated' do
......
......@@ -60,9 +60,9 @@
it 'should include the project labels as the tag_list' do
get api('/projects', user)
response.status.should == 200
json_response.should be_an Array
json_response.first.keys.should include('tag_list')
expect(response.status).to eq 200
expect(json_response).to be_an Array
expect(json_response.first.keys).to include('tag_list')
end
context 'and using search' do
......
......@@ -23,8 +23,8 @@
Sidekiq::Testing.inline! { destroy_group(group, user) }
end
it { gitlab_shell.exists?(group.path).should be_falsey }
it { gitlab_shell.exists?(remove_path).should be_falsey }
it { expect(gitlab_shell.exists?(group.path)).to be_falsey }
it { expect(gitlab_shell.exists?(remove_path)).to be_falsey }
end
context 'Sidekiq fake' do
......@@ -33,8 +33,8 @@
Sidekiq::Testing.fake! { destroy_group(group, user) }
end
it { gitlab_shell.exists?(group.path).should be_falsey }
it { gitlab_shell.exists?(remove_path).should be_truthy }
it { expect(gitlab_shell.exists?(group.path)).to be_falsey }
it { expect(gitlab_shell.exists?(remove_path)).to be_truthy }
end
end
......
......@@ -13,8 +13,8 @@
end
it { expect(Project.all).not_to include(project) }
it { Dir.exists?(path).should be_falsey }
it { Dir.exists?(remove_path).should be_falsey }
it { expect(Dir.exists?(path)).to be_falsey }
it { expect(Dir.exists?(remove_path)).to be_falsey }
end
context 'Sidekiq fake' do
......@@ -24,8 +24,8 @@
end
it { expect(Project.all).not_to include(project) }
it { Dir.exists?(path).should be_falsey }
it { Dir.exists?(remove_path).should be_truthy }
it { expect(Dir.exists?(path)).to be_falsey }
it { expect(Dir.exists?(remove_path)).to be_truthy }
end
def destroy_project(project, user, params)
......
......@@ -20,8 +20,7 @@
@result = transfer_project(project, user, new_namespace_id: nil)
end
it { expect(@result).not_to be_nil } # { result.should be_false } passes on nil
it { expect(@result).to be_falsey }
it { expect(@result).to eq false }
it { expect(project.namespace).to eq(user.namespace) }
end
......@@ -30,8 +29,7 @@
@result = transfer_project(project, user, new_namespace_id: group.id)
end
it { expect(@result).not_to be_nil } # { result.should be_false } passes on nil
it { expect(@result).to be_falsey }
it { expect(@result).to eq false }
it { expect(project.namespace).to eq(user.namespace) }
end
......
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