Skip to content

Fix tests for latest ember #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2016
Merged

Fix tests for latest ember #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
059e824
Fix test to match Glimmer2 template
tricknotes Nov 29, 2016
2a61a66
Fix test to match `Ember.VERSION`
tricknotes Nov 29, 2016
ca4eb88
Update bundler before `bundle install`
tricknotes Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ rvm:
- jruby-9.1.0.0
cache:
- bundler
before_script:
- gem install bundler # To use bundler 1.10 or later
before_install:
- gem update bundler # To use bundler 1.10 or later
gemfile:
- gemfiles/rails32_ember_113.gemfile
- gemfiles/rails40_ember_113.gemfile
Expand Down
2 changes: 1 addition & 1 deletion test/hjstemplate_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class HjsTemplateTest < IntegrationTest
get "/assets/templates/hairy.js"
assert_response :success
assert_match %r{Ember\.TEMPLATES\["hairy(\.mustache)?"\] = Ember\.(?:Handlebars|HTMLBars)\.template\(}m, @response.body
assert_match %r{function .*unbound|"name":"unbound"}m, @response.body
assert_match %r{function .*unbound|"name":"unbound"|\[\\"unbound\\"\]}m, @response.body
end

test "ensure new lines inside the anon function are persisted" do
Expand Down
2 changes: 1 addition & 1 deletion test/precompile_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def precompile!(rails_env)

contents = File.read(application_js_path)

assert_match %r{Ember\.VERSION}, contents, 'application.js should contain Ember.VERSION'
assert_match %r{Ember\.VERSION|_emberVersion\.default}, contents, 'application.js should contain Ember.VERSION'
assert_match %r{Handlebars\.VERSION|COMPILER_REVISION}, contents, 'applciation.js should contain Handlebars.VERSION'
end

Expand Down