Skip to content

Commit fe42de3

Browse files
committed
Fix: features/ci/admin/runners_spec.rb
1 parent 29b3279 commit fe42de3

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

app/models/ci/runner.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Runner < ActiveRecord::Base
3737
acts_as_taggable
3838

3939
def self.search(query)
40-
where('LOWER(runners.token) LIKE :query OR LOWER(runners.description) like :query',
40+
where('LOWER(ci_runners.token) LIKE :query OR LOWER(ci_runners.description) like :query',
4141
query: "%#{query.try(:downcase)}%")
4242
end
4343

app/views/ci/admin/runners/index.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
.append-bottom-20.clearfix
2727
.pull-left
28-
= form_tag ci_admin_runners_path, class: 'form-inline', method: :get do
28+
= form_tag ci_admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
2929
.form-group
3030
= search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token'
3131
= submit_tag 'Search', class: 'btn'

app/views/ci/admin/runners/show.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
%tr
7676
%td
77-
= form_tag ci_admin_runner_path(@runner), class: 'form-inline', method: :get do
77+
= form_tag ci_admin_runner_path(@runner), id: 'runner-projects-search', class: 'form-inline', method: :get do
7878
.form-group
7979
= search_field_tag :search, params[:search], class: 'form-control'
8080
= submit_tag 'Search', class: 'btn'

spec/features/ci/admin/runners_spec.rb

+6-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
FactoryGirl.create :ci_runner, description: 'foo'
2424
FactoryGirl.create :ci_runner, description: 'bar'
2525

26-
fill_in 'search', with: 'foo'
27-
click_button 'Search'
26+
search_form = find('#runners-search')
27+
search_form.fill_in 'search', with: 'foo'
28+
search_form.click_button 'Search'
2829
end
2930

3031
it { expect(page).to have_content("foo") }
@@ -52,8 +53,9 @@
5253

5354
describe 'search' do
5455
before do
55-
fill_in 'search', with: 'foo'
56-
click_button 'Search'
56+
search_form = find('#runner-projects-search')
57+
search_form.fill_in 'search', with: 'foo'
58+
search_form.click_button 'Search'
5759
end
5860

5961
it { expect(page).to have_content("foo") }

0 commit comments

Comments
 (0)