Some refactoring

Author: chorrell

spec/20/Dockerfile_spec.rb

@@ -12,7 +12,9 @@
     create_image(tag)
   end
 
-  test_node(dockerfile_node_version('../../20/Dockerfile'))
+  version = dockerfile_node_version("../../#{tag}/Dockerfile")
+
+  test_node(version)
 
   test_npm
 

spec/22/Dockerfile_spec.rb

@@ -12,7 +12,9 @@
     create_image(tag)
   end
 
-  test_node(dockerfile_node_version('../../22/Dockerfile'))
+  version = dockerfile_node_version("../../#{tag}/Dockerfile")
+
+  test_node(version)
 
   test_npm
 

spec/node_tests.rb

@@ -1,15 +1,4 @@
 # Node tests
-def dockerfile_node_version(dockerfile_path)
-  File.open(dockerfile_path) do |file|
-    file.each_line do |line|
-      if line =~ /^ENV NODE_VERSION=([0-9]+\.[0-9]+\.[0-9]+)/
-        return $1
-      end
-    end
-  end
-  raise "NODE_VERSION not found in #{dockerfile_path}"
-end
-
 def test_node(version)
   describe command('node -v') do
     its(:exit_status) { should eq 0 }

spec/spec_helper.rb

@@ -1,4 +1,16 @@
 module Helpers
+
+  def dockerfile_node_version(dockerfile_path)
+    File.open(dockerfile_path) do |file|
+      file.each_line do |line|
+        if line =~ /^ENV NODE_VERSION=([0-9]+\.[0-9]+\.[0-9]+)/
+          return $1
+        end
+      end
+    end
+    raise "NODE_VERSION not found in #{dockerfile_path}"
+  end
+
   def create_image(version)
 
     puts "Building image..."