Skip to content

Commit e2b3ce5

Browse files
larssmitradar
authored andcommitted
Created function for removing Gemfile.lock + removed dash from rake tasks
Related to spree#3205
1 parent 8fe4e81 commit e2b3ce5

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ end
1616
desc "Generates a dummy app for testing for every Spree engine"
1717
task :test_app do
1818
require File.expand_path('../core/lib/generators/spree/install/install_generator', __FILE__)
19-
%w(api backend core dash frontend).each do |engine|
19+
%w(api backend core frontend).each do |engine|
2020
ENV['LIB_NAME'] = File.join('spree', engine)
2121
ENV['DUMMY_PATH'] = File.expand_path("../#{engine}/spec/dummy", __FILE__)
2222
Rake::Task['common:test_app'].execute

build.sh

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
alias set_gemfile='export BUNDLE_GEMFILE="`pwd`/Gemfile"'
1+
# Remove Gemfile.lock if it exists
2+
function rm_gemfile_lock(){
23
if [ -e "Gemfile.lock" ]
34
then
45
echo "Removing Gemfile.lock..."
56
rm Gemfile.lock
6-
fi
7-
bundle check || bundle install
8-
bundle exec rake test_app
9-
cd api; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec
10-
cd ../backend; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec
11-
cd ../core; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec
12-
cd ../frontend; set_gemfile; rm Gemfile.lock; bundle install; bundle exec rspec spec
7+
fi
8+
}
9+
10+
alias set_gemfile='export BUNDLE_GEMFILE="`pwd`/Gemfile"'
11+
rm_gemfile_lock
12+
bundle check || bundle install
13+
bundle exec rake test_app
14+
cd api; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec
15+
cd ../backend; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec
16+
cd ../core; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec
17+
cd ../frontend; set_gemfile; rm_gemfile_lock; bundle install; bundle exec rspec spec

0 commit comments

Comments
 (0)