Skip to content

Commit

Permalink
fix spec
Browse files Browse the repository at this point in the history
  • Loading branch information
munen committed Jun 24, 2014
1 parent 17ed382 commit b3cd901
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ group :development, :test do
end

group :test do
gem 'capybara'#, '2.0.1'
gem 'capybara'
gem 'ci_reporter'
gem 'database_cleaner', git: '[email protected]:bmabey/database_cleaner.git'
gem 'guard-rspec'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ GEM
capistrano-rbenv (2.0.2)
capistrano (~> 3.1)
sshkit (~> 1.3)
capybara (2.2.1)
capybara (2.3.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
Expand Down Expand Up @@ -246,15 +246,15 @@ GEM
railties
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.2)
mini_portile (0.6.0)
minitest (4.7.5)
multi_json (1.9.2)
multipart-post (1.2.0)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.8.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
Expand Down
8 changes: 4 additions & 4 deletions spec/features/talks_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
end

describe "Talks" do

before do
@user = FactoryGirl.create(:user)
login_user(@user)
Expand Down Expand Up @@ -134,16 +134,16 @@
venue = FactoryGirl.create(:venue, user: @user)
visit new_venue_talk_path(venue)

fill_in :talk_title, with: 'spec talk title'
fill_in :talk_teaser, with: 'spec talk teaser'
# NOTE: Since the WYSIWYG editor is creating an ifrage, we cannot fill in
# NOTE: Since the WYSIWYG editor is creating an iframe, we cannot fill in
# the text with Capybara. jQuery to the rescue.
page.execute_script('$("iframe").contents().find("body").text("iwannabelikeyou")')
# fill in tags
fill_in 's2id_autogen2', with: 'a,b,c,'
fill_in 's2id_autogen3', with: 'a,b,c,'
fill_in 'talk_starts_at_date', with: '2014-04-29'
fill_in 'talk_starts_at_time', with: '05:12'

fill_in :talk_title, with: 'spec talk title'
click_button 'Save'
page.should have_selector('.talks-show')
page.should have_content('spec talk title')
Expand Down
2 changes: 1 addition & 1 deletion spec/features/venues_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
visit new_venue_path
fill_in 'venue_title', with: 'schubidubi'
fill_in 'venue_teaser', with: 'some teaser'
# NOTE: Since the WYSIWYG editor is creating an ifrage, we cannot fill in
# NOTE: Since the WYSIWYG editor is creating an iframe, we cannot fill in
# the text with Capybara. jQuery to the rescue.
page.execute_script('$("iframe").contents().find("body").text("iwannabelikeyou")')
# fill in tags
Expand Down

0 comments on commit b3cd901

Please sign in to comment.